Update VERSION

Changing EFI 32bit

.gitignore

@@ -12,3 +12,4 @@ cache
 /files/board/arpl/p3/addons
 /files/board/arpl/p3/lkms
 /files/board/arpl/p3/modules
+/tests

README.md

@@ -81,6 +81,11 @@ Select the "Boot" option and wait for the DSM to boot:
 The DSM kernel does not display messages on the screen, so it is necessary to continue the process of configuring DSM through the browser by accessing the address `http://<ip>`.
 There are several tutorials on how to configure DSM over the internet, which will not be covered here.
 
+# Tutorials
+
+An ARPL user (Rikkie) created a tutorial to install ARPL on a proxmox server:
+https://hotstuff.asia/2023/01/03/xpenology-with-arpl-on-proxmox-the-easy-way/
+
 # Troubles/questions/etc
 
 Please search the forums at https://xpenology.com/forum if your question/problem has been discussed and resolved. If you can't find a solution, use github issues.

TODO

@@ -4,7 +4,7 @@ A fazer
  - "Sensitive data" (#312)
  - Checar drivers para MMC/SD/eMMC
  - Checar drivers para chelsio T420, T520 e T580
- - 
+ - Melhorar função getAllModules()
 
 Concluidos:
  - Generalizar código dos addons

VERSION

@@ -1 +1 @@
-1.0-beta9
+1.0-beta10a

docker/syno-compiler/files/opt/do.sh

@@ -47,6 +47,7 @@ function compile-module {
     echo "Platform ${1} not found."
     exit 1
   fi
+  unset VALID
   echo -e "Compiling module for \033[7m${PLATFORM}-${KVER}\033[0m..."
   cp -R /input /tmp
   export-vars ${PLATFORM}

files/board/arpl/kernel_defconfig

@@ -17,8 +17,10 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
+CONFIG_NAMESPACES=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
 CONFIG_SMP=y
@@ -31,8 +33,6 @@ CONFIG_NUMA=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_MIXED=y
 CONFIG_HZ_1000=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
@@ -362,15 +362,27 @@ CONFIG_AGP_INTEL=y
 CONFIG_DRM=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
+CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_HIDRAW=y
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_EZKEY=y
 CONFIG_HID_GYRATION=y
+CONFIG_HID_ITE=y
+CONFIG_HID_KENSINGTON=y
+CONFIG_HID_LOGITECH=y
 CONFIG_LOGITECH_FF=y
+CONFIG_HID_REDRAGON=y
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
 CONFIG_HID_NTRIG=y
 CONFIG_HID_PANTHERLORD=y
 CONFIG_PANTHERLORD_FF=y
@@ -473,7 +485,6 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y

files/board/arpl/overlayfs/etc/inittab

@@ -25,11 +25,14 @@ null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin
 null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout
 null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
 ::sysinit:/bin/hostname -F /etc/hostname
+# Reduce kernel logs
+::sysinit:/usr/bin/dmesg -n 1
 # now run any rc scripts
 ::sysinit:/etc/init.d/rcS
 
 # Login in terminals
-::respawn:/sbin/agetty -a root --noclear tty1
+tty1::respawn:/sbin/agetty -a root --noclear tty1
+tty2::askfirst:/sbin/agetty --noclear tty2
 ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 linux
 ::respawn:/usr/bin/ttyd login -f root
 
@@ -40,3 +43,4 @@ ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 linux
 ::shutdown:/etc/init.d/rcK
 ::shutdown:/sbin/swapoff -a
 ::shutdown:/bin/umount -a -r
+::shutdown:/usr/sbin/kexec -e -a

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

@@ -78,7 +78,7 @@ done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
 # Check if machine has EFI
 [ -d /sys/firmware/efi ] && EFI=1 || EFI=0
 # Read EFI bug value
-EFI_BUG="`readModelKey "${MODEL}" "builds.${BUILD}.efi-bug"`"
+[ "${MODEL}" = "DS3615" ] && EFI_BUG=1 || EFI_BUG=0
 
 LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`"
 BUS=`udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2`
@@ -106,7 +106,7 @@ 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"
+CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 loglevel=15 log_buf_len=32M"
 for KEY in ${!CMDLINE[@]}; do
   VALUE="${CMDLINE[${KEY}]}"
   CMDLINE_LINE+=" ${KEY}"
@@ -150,11 +150,10 @@ echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 # Executes DSM kernel via KEXEC
 if [ "${EFI_BUG}" = "yes" -a ${EFI} -eq 1 ]; then
   echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"
-  kexec --args-linux --noefi -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
+  kexec --noefi -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
 else
-  kexec --args-linux -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
+  kexec -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
 fi
-/sbin/swapoff -a >/dev/null 2>&1 || true
-/bin/umount -a -r >/dev/null 2>&1 || true
 echo -e "\033[1;37mBooting...\033[0m"
-kexec -e -a >"${LOG_FILE}" 2>&1 || dieLog
+poweroff
+while true; do sleep 1; done # infinity loop

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

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

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

@@ -14,7 +14,7 @@ function getAllModules() {
   for F in `ls ${TMP_PATH}/modules/*.ko`; do
     X=`basename ${F}`
     M=${X:0:-3}
-    DESC=`modinfo ${F} | awk -F':' '/description/{ print $2}' | awk '{sub(/^[ ]+/,""); print}'`
+    DESC=`modinfo ${F} | awk -F':' '/description:/{ print $2}' | awk '{sub(/^[ ]+/,""); print}'`
     [ -z "${DESC}" ] && DESC="${X}"
     echo "${M} \"${DESC}\""
   done

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

@@ -1132,6 +1132,11 @@ function updateMenu() {
           rm "${MODULES_PATH}/${P}.tgz"
           mv "/tmp/${P}.tgz" "${MODULES_PATH}/${P}.tgz"
         done
+        # Rebuild modules
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        while read ID DESC; do
+          writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+        done < <(getAllModules "${PLATFORM}" "${KVER}")
         DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
           --msgbox "Modules updated with success!" 0 0

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

@@ -13,6 +13,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_1520+"
 beta: true
@@ -29,7 +30,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -50,7 +50,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -71,7 +70,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

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

@@ -16,6 +16,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_1621+"
 dom: 2
@@ -31,7 +32,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -52,7 +52,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -73,7 +72,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

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

@@ -16,6 +16,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_2422+"
 dom: 2
@@ -32,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -52,7 +52,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -73,7 +72,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml

@@ -15,6 +15,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "bromolow"
 unique: "synology_bromolow_3615xs"
 serial:
@@ -32,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: yes
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -54,7 +54,6 @@ builds:
     ver: "7.1.0"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: yes
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -76,7 +75,6 @@ builds:
     ver: "7.1.1"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml

@@ -15,6 +15,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "broadwell"
 unique: "synology_broadwell_3617xs"
 dom: 1
@@ -32,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -54,7 +54,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -76,7 +75,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

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

@@ -16,6 +16,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "broadwellnk"
 unique: "synology_broadwellnk_3622xs+"
 dom: 1
@@ -33,7 +34,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -55,7 +55,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -77,7 +76,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

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

@@ -16,6 +16,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "apollolake"
 unique: "synology_apollolake_918+"
 dom: 2
@@ -35,7 +36,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -57,7 +57,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -79,7 +78,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

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

@@ -13,6 +13,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_920+"
 dom: 2
@@ -31,7 +32,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -52,7 +52,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -73,7 +72,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

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

@@ -12,6 +12,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  elevator: elevator
 platform: "r1000"
 unique: "synology_r1000_923+"
 beta: true
@@ -31,7 +32,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml

@@ -15,6 +15,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_dva1622"
 dom: 2
@@ -33,7 +34,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -54,7 +54,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml

@@ -16,6 +16,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "denverton"
 unique: "synology_denverton_dva3219"
 beta: true
@@ -34,7 +35,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -56,7 +56,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -78,7 +77,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml

@@ -14,6 +14,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "denverton"
 unique: "synology_denverton_dva3221"
 dom: 2
@@ -33,7 +34,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -55,7 +55,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -77,7 +76,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml

@@ -13,6 +13,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_fs2500"
 beta: true
@@ -29,7 +30,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -50,7 +50,6 @@ builds:
     ver: "7.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -71,7 +70,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

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

@@ -5,6 +5,8 @@ synoinfo: &synoinfo
   support_bde_internal_10g: "no"
   esataportcfg: "0x0"
   support_led_brightness_adjustment: "no"
+  support_syno_hybrid_raid: "yes"
+  supportraidgroup: "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"
@@ -14,6 +16,7 @@ cmdline: &cmdline
   syno_hdd_detect: 0
   syno_port_thaw: 1
   vender_format_version: 2
+  elevator: elevator
 platform: "broadwellnk"
 unique: "synology_broadwellnk_rs4021xs+"
 beta: true
@@ -30,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -52,7 +54,6 @@ builds:
     ver: "7.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -74,7 +75,6 @@ builds:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled

@@ -12,6 +12,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  scsi_mod.use_blk_mq: 1
 platform: "epyc7002"
 unique: "synology_epyc7002_sa6400"
 beta: true
@@ -28,7 +29,6 @@ builds:
     ver: "7.1.1"
     kver: "5.10.55"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh

@@ -71,12 +71,10 @@ else
   # Kernel version 5.x
   gzip -cd "${SCRIPT_DIR}/bzImage-template-v5.gz" > "${ZIMAGE_MOD}"
 
-  lzma -9c ${VMLINUX_MOD} > ${TMP_PATH}/vmlinux-mod.lzma
-  dd if="${TMP_PATH}/vmlinux-mod.lzma" of="${ZIMAGE_MOD}" bs=15377 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
-  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=8377991 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
-  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=8420412 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
-
-  RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
-  size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=8420408 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=14561 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34463421 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34479132 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+#  RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
+#  size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=34626904 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
   size_le $(($((16#`crc32 "${ZIMAGE_MOD}" | awk '{print$1}'`)) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
 fi

files/board/arpl/p1/ARPL-VERSION

@@ -1 +1 @@
-1.0-beta9
+1.0-beta11

files/board/arpl/p1/grub/grub.cfg

@@ -1,15 +1,50 @@
+insmod search
 insmod echo
 insmod terminal
 insmod test
-
-terminal_input console
-terminal_output console
+insmod font
+insmod loadenv
+insmod serial
+insmod usb_keyboard
+insmod linux
+insmod gzio
+insmod fat
+insmod ext2
 
 set default="boot"
 set timeout="5"
 set timeout_style="menu"
 
-insmod loadenv
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}
+
+if loadfont unicode ; then
+  set gfxmode=auto
+  load_video
+  insmod gfxterm
+  #set gfxpayload=800x600
+fi
+terminal_output gfxterm
+
+#set menu_color_normal=cyan/blue
+#set menu_color_highlight=white/blue
+
+if serial --unit=0 --speed=115200; then
+  terminal_input --append serial_com0
+  terminal_output --append serial_com0
+fi
+
 if [ -s $prefix/grubenv ]; then
   load_env
 fi
@@ -22,51 +57,37 @@ if [ "${next_entry}" ]; then
    save_env next_entry
 fi
 
-insmod usb_keyboard
-insmod part_msdos
-insmod ext2
-insmod fat
-insmod linux
-insmod gzio
-
-set gfxmode=auto
-if [ "${grub_platform}" = "efi" ]; then
-  insmod efi_gop
-  insmod efi_uga
-else
-  insmod vbe
-  insmod vga
-fi
-
-insmod serial
 if serial --unit=0 --speed=115200; then
   terminal_input --append serial_com0
   terminal_output --append serial_com0
 fi
 
-insmod search
+set TERM=tty2
 search --set=root --label "ARPL3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
   if [ "${default}" = "direct" ]; then
     set timeout="1"
     menuentry 'Boot DSM kernel directly' --id direct {
+      load_video
       echo "Loading DSM kernel..."
-      linux /zImage-dsm console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 elevator=elevator root=/dev/md0 loglevel=15 ${dsm_cmdline}
+      linux /zImage-dsm console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 loglevel=15 ${dsm_cmdline}
       echo "Loading DSM initramfs..."
       initrd /initrd-dsm
       echo "Booting..."
     }
   fi
   menuentry 'Boot DSM' --id boot {
+    load_video
     echo "Loading kernel..."
-    linux /bzImage-arpl console=ttyS0,115200n8 quiet net.ifnames=0 biosdevname=0
+    linux /bzImage-arpl console=${TERM} net.ifnames=0
     echo "Loading initramfs..."
     initrd /initrd-arpl
     echo "Booting..."
   }
   menuentry 'Force re-install DSM' --id junior {
+    load_video
     echo "Loading kernel..."
-    linux /bzImage-arpl console=ttyS0,115200n8 quiet net.ifnames=0 biosdevname=0 force_junior
+    linux /bzImage-arpl console=${TERM} net.ifnames=0 force_junior
     echo "Loading initramfs..."
     initrd /initrd-arpl
     echo "Booting..."
@@ -76,8 +97,9 @@ else
 fi
 
 menuentry 'Configure loader' --id config {
+  load_video
   echo "Loading kernel..."
-  linux /bzImage-arpl console=ttyS0,115200n8 quiet net.ifnames=0 biosdevname=0 IWANTTOCHANGETHECONFIG
+  linux /bzImage-arpl console=${TERM} net.ifnames=0 IWANTTOCHANGETHECONFIG
   echo "Loading initramfs..."
   initrd /initrd-arpl
   echo "Booting..."

files/configs/arpl_defconfig

@@ -1,4 +1,6 @@
 BR2_x86_64=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR=".buildroot-ccache"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="arpl"
@@ -21,6 +23,8 @@ BR2_PACKAGE_BZIP2=y
 BR2_PACKAGE_XZ=y
 BR2_PACKAGE_KEXEC=y
 BR2_PACKAGE_KEXEC_ZLIB=y
+BR2_PACKAGE_LSOF=y
+BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_BINUTILS=y
 BR2_PACKAGE_BINUTILS_TARGET=y
 BR2_PACKAGE_CPIO=y
@@ -39,6 +43,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
 BR2_PACKAGE_ACPID=y
+BR2_PACKAGE_DMIDECODE=y
+BR2_PACKAGE_DT_UTILS=y
 BR2_PACKAGE_KBD=y
 BR2_PACKAGE_LSHW=y
 BR2_PACKAGE_LSSCSI=y
@@ -53,6 +59,7 @@ BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_PCRE2=y
 BR2_PACKAGE_DHCPCD=y
+BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_OPENSSH=y
 # BR2_PACKAGE_OPENSSH_CLIENT is not set
 BR2_PACKAGE_SAMBA4=y
@@ -72,4 +79,3 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_R8125=y
-

new_bn.sh

@@ -56,7 +56,6 @@ for MODEL in DS918+ DS920+ DS923+ DS1520+ DS1621+ DS2422+ DS3615xs DS3617xs DS36
     ver: "${RELEASE}"
     kver: "${KVERS[${MODEL}]}"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:

rss.json

@@ -90,88 +90,11 @@
             "mUnique": "synology_broadwellnk_rs4021xs+",
             "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_RS4021xs%2B_42962.pat",
             "mCheckSum": "c8574a8e358fe40a7b49bbf1ddf38491"
-          }
-        ]
-      },
-      {
-        "title": "DSM 7.1.1-42951",
-        "MajorVer": 7,
-        "MinorVer": 1,
-        "NanoVer": 1,
-        "BuildPhase": 0,
-        "BuildNum": 42951,
-        "BuildDate": "2022/08/01",
-        "ReqMajorVer": 7,
-        "ReqMinorVer": 1,
-        "ReqBuildPhase": 0,
-        "ReqBuildNum": 41890,
-        "ReqBuildDate": "2021/06/25",
-        "isSecurityVersion": false,
-        "model": [
-          {
-            "mUnique": "synology_apollolake_918+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS918%2B_42951.pat",
-            "mCheckSum": "fbdd1584dfcb1898df5f66a886a6e9b7"
           },
           {
-            "mUnique": "synology_geminilake_920+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS920%2B_42951.pat",
-            "mCheckSum": "9fcb2a54b13f4e6acc3947c2165a464b"
-          },
-          {
-            "mUnique": "synology_geminilake_1520+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1520%2B_42951.pat",
-            "mCheckSum": "5fd40dc13c83ff14bc10fd43a7d19606"
-          },
-          {
-            "mUnique": "synology_v1000_1621+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1621%2B_42951.pat",
-            "mCheckSum": "4e52301c56ae5e7b03ff9ea1f8392d43"
-          },
-          {
-            "mUnique": "synology_v1000_2422+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS2422%2B_42951.pat",
-            "mCheckSum": "40da0cb929793e3d165f5958d4a5533b"
-          },
-          {
-            "mUnique": "synology_bromolow_3615xs",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3615xs_42951.pat",
-            "mCheckSum": "1f6831d8706d8337f06a6028037fe120"
-          },
-          {
-            "mUnique": "synology_broadwell_3617xs",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3617xs_42951.pat",
-            "mCheckSum": "d6c61c7c84320ccc684b76ae6219e650"
-          },
-          {
-            "mUnique": "synology_broadwellnk_3622xs+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3622xs%2B_42951.pat",
-            "mCheckSum": "b34b7b7d21af459ae0ba6ea1f9974de6"
-          },
-          {
-            "mUnique": "synology_geminilake_dva1622",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA1622_42951.pat",
-            "mCheckSum": "6e119d8eb2c0a175a56b0bbba1f43372"
-          },
-          {
-            "mUnique": "synology_denverton_dva3219",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3219_42951.pat",
-            "mCheckSum": "309b02195fb52239ee6fdfafdf157cd1"
-          },
-          {
-            "mUnique": "synology_denverton_dva3221",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3221_42951.pat",
-            "mCheckSum": "59c68430cb9cd20322cb287334a4017b"
-          },
-          {
-            "mUnique": "synology_v1000_fs2500",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_FS2500_42951.pat",
-            "mCheckSum": "7b48e21c1f2090bb01d5f14a8e16a435"
-          },
-          {
-            "mUnique": "synology_broadwellnk_rs4021xs+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_RS4021xs%2B_42951.pat",
-            "mCheckSum": "e2d11981bba84b2eb6ba62b8bf2d2d28"
+            "mUnique": "synology_epyc7002_sa6400",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_SA6400_42962.pat",
+            "mCheckSum": "fdbbea86e280a8f754339a064f9ad2df"
           }
         ]
       },

rss.xml

@@ -87,83 +87,10 @@
         <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_RS4021xs%2B_42962.pat</mLink>
         <mCheckSum>c8574a8e358fe40a7b49bbf1ddf38491</mCheckSum>
       </model>
-    </item>
-    <item>
-      <title>DSM 7.1.1-42951</title>
-      <MajorVer>7</MajorVer>
-      <MinorVer>1</MinorVer>
-      <BuildPhase>1</BuildPhase>
-      <BuildNum>42951</BuildNum>
-      <BuildDate>2022/08/01</BuildDate>
-      <ReqMajorVer>7</ReqMajorVer>
-      <ReqMinorVer>0</ReqMinorVer>
-      <ReqBuildPhase>0</ReqBuildPhase>
-      <ReqBuildNum>41890</ReqBuildNum>
-      <ReqBuildDate>2021/06/25</ReqBuildDate>
       <model>
-        <mUnique>synology_apollolake_918+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS918%2B_42951.pat</mLink>
-        <mCheckSum>fbdd1584dfcb1898df5f66a886a6e9b7</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_geminilake_920+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS920%2B_42951.pat</mLink>
-        <mCheckSum>9fcb2a54b13f4e6acc3947c2165a464b</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_geminilake_1520+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1520%2B_42951.pat</mLink>
-        <mCheckSum>5fd40dc13c83ff14bc10fd43a7d19606</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_v1000_1621+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1621%2B_42951.pat</mLink>
-        <mCheckSum>4e52301c56ae5e7b03ff9ea1f8392d43</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_v1000_2422+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS2422%2B_42951.pat</mLink>
-        <mCheckSum>40da0cb929793e3d165f5958d4a5533b</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_bromolow_3615xs</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3615xs_42951.pat</mLink>
-        <mCheckSum>1f6831d8706d8337f06a6028037fe120</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_broadwell_3617xs</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3617xs_42951.pat</mLink>
-        <mCheckSum>d6c61c7c84320ccc684b76ae6219e650</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_broadwellnk_3622xs+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3622xs%2B_42951.pat</mLink>
-        <mCheckSum>b34b7b7d21af459ae0ba6ea1f9974de6</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_geminilake_dva1622</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA1622_42951.pat</mLink>
-        <mCheckSum>6e119d8eb2c0a175a56b0bbba1f43372</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_denverton_dva3219</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3219_42951.pat</mLink>
-        <mCheckSum>309b02195fb52239ee6fdfafdf157cd1</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_denverton_dva3221</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3221_42951.pat</mLink>
-        <mCheckSum>59c68430cb9cd20322cb287334a4017b</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_v1000_fs2500</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_FS2500_42951.pat</mLink>
-        <mCheckSum>7b48e21c1f2090bb01d5f14a8e16a435</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_broadwellnk_rs4021xs+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_RS4021xs%2B_42951.pat</mLink>
-        <mCheckSum>e2d11981bba84b2eb6ba62b8bf2d2d28</mCheckSum>
+        <mUnique>synology_epyc7002_sa6400</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_SA6400_42962.pat</mLink>
+        <mCheckSum>fdbbea86e280a8f754339a064f9ad2df</mCheckSum>
       </model>
     </item>
     <item>