Merge pull request #358 from fbelavenuto/binaries

Update binaries

.gitignore

@@ -5,7 +5,7 @@ arpl*.vmdk
 *.zip
 .buildroot
 test*.sh
-docker/Dockerfile
-docker/cache
+docker/syno-compiler/Dockerfile
+cache
 *.bak
 *.o

PLATFORMS

@@ -5,3 +5,4 @@ broadwellnk	4.4.180
 denverton	4.4.180
 geminilake	4.4.180
 v1000   4.4.180
+r1000   4.4.180

TODO

@@ -1,6 +1,10 @@
 A fazer
  - Checar NVME no modelo DS920+, DS918+
  - Checar módulo tg3 no próprio loader (BCM57780 [14e4:1692]) (#31)
+ - "Sensitive data" (#312)
+ - Checar drivers para MMC/SD/eMMC
+ - Checar drivers para chelsio T420, T520 e T580
+ - 
 
 Concluidos:
  - Generalizar código dos addons

VERSION

@@ -1 +1 @@
-1.0-beta3
+1.0-beta4

docker/syno-compiler/Dockerfile.template

@@ -23,7 +23,7 @@ ENV SHELL=/bin/bash \
     ARCH=x86_64
 
 RUN apt update --yes && \
-    apt install --yes --no-install-recommends --no-install-suggests \
+    apt install --yes --no-install-recommends --no-install-suggests --allow-unauthenticated \
       ca-certificates nano curl bc kmod git gettext texinfo autopoint gawk sudo \
       build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
     apt-get clean && \

docker/syno-compiler/build.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+CACHE_DIR="cache"
+PLATFORM_FILE="../../PLATFORMS"
+
 ###############################################################################
 function trap_cancel() {
     echo "Press Control+C once more terminate the process (or wait 2s for it to restart)"
@@ -19,32 +22,33 @@ function prepare() {
   URLS["denverton"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Denverton%29/denverton-${GCCLIB_VER}_x86_64-GPL.txz"
   URLS["geminilake"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28GeminiLake%29/geminilake-${GCCLIB_VER}_x86_64-GPL.txz"
   URLS["v1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28V1000%29/v1000-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["r1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/AMD%20x86%20Linux%204.4.180%20%28r1000%29/r1000-${GCCLIB_VER}_x86_64-GPL.txz"
 
   # Read platforms/kerver version
   echo "Reading platforms"
   declare -A PLATFORMS
   while read PLATFORM KVER; do
     PLATFORMS[${PLATFORM}]="${KVER}"
-  done <../PLATFORMS
+  done < ${PLATFORM_FILE}
 
   # Download toolkits
-  mkdir -p cache
+  mkdir -p ${CACHE_DIR}
 
   for PLATFORM in ${!PLATFORMS[@]}; do
     KVER="${PLATFORMS[${PLATFORM}]}"
-    echo -n "Checking cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
-    if [ ! -f "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
+    echo -n "Checking ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
+    if [ ! -f "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
       URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
       echo "Downloading ${URL}"
-      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+      curl -L "${URL}" -o "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
     else
       echo "OK"
     fi
-    echo -n "Checking cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz... "
-    if [ ! -f "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz" ]; then
+    echo -n "Checking ${CACHE_DIR}/${PLATFORM}-toolchain.txz... "
+    if [ ! -f "${CACHE_DIR}/${PLATFORM}-toolchain.txz" ]; then
       URL=${URLS["${PLATFORM}"]}
       echo "Downloading ${URL}"
-      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz"
+      curl -L "${URL}" -o "${CACHE_DIR}/${PLATFORM}-toolchain.txz"
     else
       echo "OK"
     fi
@@ -62,13 +66,13 @@ function prepare() {
 }
 
 # 7.0
-TOOLKIT_VER="7.0"
-TOOLCHAIN_VER="7.0-41890"
-GCCLIB_VER="gcc750_glibc226"
-prepare
-echo "Building ${TOOLKIT_VER}"
-docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
-docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER}
+#TOOLKIT_VER="7.0"
+#TOOLCHAIN_VER="7.0-41890"
+#GCCLIB_VER="gcc750_glibc226"
+#prepare
+#echo "Building ${TOOLKIT_VER}"
+#docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
+#docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER}
 
 # 7.1
 TOOLKIT_VER="7.1"

docker/syno-toolkit/Dockerfile

@@ -0,0 +1,15 @@
+FROM scratch
+ARG PLATFORM
+ARG TOOLKIT_VER
+ARG CACHE_DIR
+
+ENV PLATFORM=${PLATFORM} TOOLKIT_VER=${TOOLKIT_VER}
+ADD ${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz /
+ADD ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz /
+ADD ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz /
+ADD rootfs /
+
+WORKDIR /input
+VOLUME /input /output
+
+ENTRYPOINT ["/usr/bin/do.sh"]

docker/syno-toolkit/build.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+set -e
+
+CACHE_DIR="cache"
+PLATFORM_FILE="../../PLATFORMS"
+TOOLKIT_VER=7.1
+
+###############################################################################
+function trap_cancel() {
+    echo "Press Control+C once more terminate the process (or wait 2s for it to restart)"
+    sleep 2 || exit 1
+}
+trap trap_cancel SIGINT SIGTERM
+cd `dirname $0`
+
+# Read platforms/kerver version
+echo "Reading platforms"
+declare -A PLATFORMS
+while read PLATFORM KVER; do
+  PLATFORMS[${PLATFORM}]="${KVER}"
+done < ${PLATFORM_FILE}
+
+# Download toolkits
+mkdir -p ${CACHE_DIR}
+
+# Check base environment
+echo -n "Checking ${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz... "
+if [ ! -f "${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz" ]; then
+  URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/base_env-${TOOLKIT_VER}.txz"
+  echo "Downloading ${URL}"
+  curl -L "${URL}" -o "${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz"
+else
+  echo "OK"
+fi
+
+# Check all platforms
+for PLATFORM in ${!PLATFORMS[@]}; do
+  echo -n "Checking ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
+  if [ ! -f "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
+    URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+    echo "Downloading ${URL}"
+    curl -L "${URL}" -o "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+  else
+    echo "OK"
+  fi
+  echo -n "Checking ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz... "
+  if [ ! -f "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz" ]; then
+    URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz"
+    echo "Downloading ${URL}"
+    curl -L "${URL}" -o "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz"
+  else
+    echo "OK"
+  fi
+done
+
+# Generate docker images
+for PLATFORM in ${!PLATFORMS[@]}; do
+  docker buildx build . --build-arg PLATFORM=${PLATFORM} --build-arg TOOLKIT_VER=${TOOLKIT_VER} --build-arg CACHE_DIR="${CACHE_DIR}" \
+    --tag fbelavenuto/syno-toolkit:${PLATFORM}-${TOOLKIT_VER} --load
+done

docker/syno-toolkit/rootfs/etc/profile.d/login.sh

@@ -0,0 +1,10 @@
+[[ "$-" != *i* ]] && return
+export LS_OPTIONS='--color=auto'
+export SHELL='linux'
+eval "`dircolors`"
+alias ls='ls -F -h --color=always -v --author --time-style=long-iso'
+alias ll='ls -l'
+alias l='ls -l -a'
+alias h='history 25'
+alias j='jobs -l'
+export PATH="/opt/${PLATFORM}/bin:${PATH}"

docker/syno-toolkit/rootfs/usr/bin/do.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+set -e
+
+###############################################################################
+function compile-module {
+  echo -e "Compiling module for \033[7m${PLATFORM}\033[0m..."
+  cp -R /input /tmp
+  make -C ${KSRC} M=/tmp/input ${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m modules
+  while read F; do
+    strip -g "${F}"
+    echo "Copying `basename ${F}`"
+    cp "${F}" "/output"
+    chown 1000.1000 "/output/`basename ${F}`"
+  done < <(find /tmp/input -name \*.ko)
+}
+
+###############################################################################
+function compile-lkm {
+  cp -R /input /tmp
+  make -C "/tmp/input" dev-v7
+  strip -g "/tmp/input/redpill.ko"
+  mv "/tmp/input/redpill.ko" "/output/redpill-dev.ko"
+  chown 1000.1000 /output/redpill-dev.ko
+  make -C "/tmp/input" clean
+  make -C "/tmp/input" prod-v7
+  strip -g "/tmp/input/redpill.ko"
+  mv "/tmp/input/redpill.ko" "/output/redpill-prod.ko"
+  chown 1000.1000 /output/redpill-prod.ko
+}
+
+###############################################################################
+# function compile-drivers {
+#   while read platform kver; do
+#     SRC_PATH="/opt/${platform}"
+#     echo "Compiling for ${platform}-${kver}"
+#     cd /opt/linux-${kver}/drivers
+#     while read dir; do
+#       if [ -f "${dir}/Makefile" ]; then
+#         echo "Driver `basename ${dir}`"
+#         grep "CONFIG_.*/.*"   "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=n/g' >  /tmp/env
+#         grep "CONFIG_.*\.o.*" "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=m/g' >> /tmp/env
+#         make -C "${SRC_PATH}" M=$(readlink -f "${dir}") clean
+#         cat /tmp/env | xargs -d '\n' make -C "${SRC_PATH}" M=$(readlink -f "${dir}") modules $@
+#       fi
+#     done < <(find -type d)
+#     DST_PATH="/output/compiled-mods/${platform}-${kver}"
+#     mkdir -p "${DST_PATH}"
+#     while read f; do
+#       strip -g "${f}"
+#       mv "${f}" "${DST_PATH}"
+#     done < <(find -name \*.ko)
+#   done </opt/platforms
+# }
+
+###############################################################################
+###############################################################################
+
+if [ $# -lt 1 ]; then
+  echo "Use: <command> (<params>)"
+  echo "Commands: shell | compile-module | compile-lkm"
+  exit 1
+fi
+export KSRC="/usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}/build"
+export LINUX_SRC="/usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}/build"
+case $1 in
+  shell) shift && bash -l $@ ;;
+  compile-module) compile-module ;;
+  compile-lkm) compile-lkm ;;
+  # compile-drivers) compile-drivers ;;
+  *) echo "Command not recognized: $1" ;;
+esac

files/board/arpl/overlayfs/opt/arpl/boot.sh

@@ -102,10 +102,10 @@ fi
 
 # Prepare command line
 CMDLINE_LINE=""
-CMDLINE_DIRECT=""
 grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
 [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi "
 [ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} "
+CMDLINE_DIRECT="${CMDLINE_LINE}"
 CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 elevator=elevator root=/dev/md0 loglevel=15"
 for KEY in ${!CMDLINE[@]}; do
   VALUE="${CMDLINE[${KEY}]}"
@@ -117,7 +117,6 @@ done
 # Escape special chars
 CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`
 CMDLINE_DIRECT=`echo ${CMDLINE_DIRECT} | sed 's/>/\\\\>/g'`
-grub-editenv ${GRUB_PATH}/grubenv set dsm_cmdline="${CMDLINE_DIRECT}"
 echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"
 
 # Wait for an IP
@@ -128,7 +127,7 @@ while true; do
   if [ -n "${IP}" ]; then
     echo -e ": \033[1;32m${IP}\033[0m"
     break
-  elif [ ${COUNT} -eq 15 ]; then
+  elif [ ${COUNT} -eq 30 ]; then
     echo -e ": \033[1;31mERROR\033[0m"
     break
   fi
@@ -139,6 +138,7 @@ done
 
 DIRECT="`readConfigKey "directboot" "${USER_CONFIG_FILE}"`"
 if [ "${DIRECT}" = "true" ]; then
+  grub-editenv ${GRUB_PATH}/grubenv set dsm_cmdline="${CMDLINE_DIRECT}"
   echo -e "\033[1;33mReboot to boot directly in DSM\033[0m"
   grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct"
   reboot

files/board/arpl/overlayfs/opt/arpl/include/consts.sh

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="1.0-beta3"
+ARPL_VERSION="1.0-beta4"
 
 # Define paths
 TMP_PATH="/tmp"

files/board/arpl/overlayfs/opt/arpl/init.sh

@@ -160,7 +160,7 @@ fi
 COUNT=0
 echo -n "Waiting IP."
 while true; do
-  if [ ${COUNT} -eq 15 ]; then
+  if [ ${COUNT} -eq 30 ]; then
     echo "ERROR"
     break
   fi

files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml

@@ -9,6 +9,7 @@ synoinfo: &synoinfo
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
+  #support_ssd_cache: yes
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0

files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml

@@ -0,0 +1,49 @@
+id: "DS923+"
+synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
+cmdline: &cmdline
+  SMBusHddDynamicPower: 1
+  synoboot2:
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+  vender_format_version: 2
+platform: "r1000"
+unique: "synology_r1000_923+"
+beta: true
+dom: 2
+dt: true
+serial:
+  prefix:
+    - "2030"
+    - "2040"
+    - "20C0"
+    - "2150"
+  middle: "SBR"
+  suffix: "alpha"
+disks: 4
+builds:
+  42962:
+    ver: "7.1.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    efi-bug: no
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS923%2B_42962.pat"
+      hash: "e33b47df446ce0bd99c5613767c9dba977915e25acfb5ccb9f5650b14459458f"
+      ramdisk-hash: "0aa3f1b2d00f887aaf0d0e2c8b51ec97bb545bf5f99c40f33d3eaabc32a5ac03"
+      zimage-hash: "1e54804c84e0b4e7f71eff5b5ec8aad9c6ba8fb4fc200ad92251d7d29155a651"
+      md5-hash: "fdff6232dacf9bd3b189506f51577128"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
+      - "ramdisk-42951-post-init-script.patch"

files/board/arpl/p3/addons/9p/manifest.yml

@@ -23,3 +23,6 @@ available-for:
   v1000-4.4.180:
     install-script: *script
     copy: "v1000-4.4.180"
+  r1000-4.4.180:
+    install-script: *script
+    copy: "r1000-4.4.180"

files/board/arpl/p3/addons/acpid/manifest.yml

@@ -12,3 +12,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/dbgutils/manifest.yml

@@ -12,3 +12,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/dtbpatch/manifest.yml

@@ -14,3 +14,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/eudev/manifest.yml

@@ -14,3 +14,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/i915-10th/manifest.yml

@@ -0,0 +1,11 @@
+version: 1
+name: i915-10th
+description: "mzcls687's Intel iGPU Drivers (10th Gen)"
+obs: https://xpenology.com/forum/topic/59909-i915ko-backported-driver-for-intel-10th-gen-ds918-ver-701-up3
+available-for:
+  apollolake-4.4.180:
+    install-script: "install.sh"
+    copy: "apollolake-4.4.180"
+  geminilake-4.4.180:
+    install-script: "install.sh"
+    copy: "geminilake-4.4.180"

files/board/arpl/p3/addons/i915-8th/manifest.yml

@@ -1,5 +1,5 @@
 version: 1
-name: i915-3e98
+name: i915-8th
 description: "Cryental's Intel iGPU Drivers (8-9th Gen)"
 available-for:
   apollolake-4.4.180:

files/board/arpl/p3/addons/lsiutil/manifest.yml

@@ -12,3 +12,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/maxdisks/manifest.yml

@@ -13,3 +13,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/misc/manifest.yml

@@ -12,3 +12,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/powersched/manifest.yml

@@ -14,3 +14,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/board/arpl/p3/addons/remove-pma/manifest.yml

@@ -1,6 +1,6 @@
 version: 1
 name: remove-pma
-description: "Create a systemd timer to remove *.pma files from Surveillance Station (#215 issue)"
+description: "Create a cron entry to remove *.pma files from Surveillance Station (#215 issue)"
 all:
   install-script: "install.sh"
 available-for:
@@ -11,3 +11,4 @@ available-for:
   denverton-4.4.180:
   geminilake-4.4.180:
   v1000-4.4.180:
+  r1000-4.4.180:

files/configs/arpl_defconfig

@@ -72,3 +72,4 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_R8125=y
+