Merge pull request #530 from fbelavenuto/beta13a

Testing new system addon 'wol'
2025-12-24 23:12:05 +08:00 · 2023-01-23 13:42:27 -03:00 · 2023-01-23 13:42:12 -03:00 · 2023-01-20 19:27:12 -03:00 · 2023-01-20 19:26:39 -03:00 · 2023-01-20 15:00:51 -03:00
24 changed files with 38 additions and 27 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-1.0-beta12
+1.0-beta13a
--- a/docker/syno-compiler/files/opt/do.sh
+++ b/docker/syno-compiler/files/opt/do.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-set -e
+set -eo pipefail

 ###############################################################################
 function export-vars() {
@@ -27,6 +27,7 @@ function export-vars() {
 function shell() {
  cp -fv /opt/${2}/build/.config /opt/${2}/source/
  cp -fv /opt/${2}/build/System.map /opt/${2}/source/
+  cp -fv /opt/${2}/build/Module.symvers /opt/${2}/source/
  export-vars $2
  shift 2
  bash -l $@
@@ -55,8 +56,7 @@ function compile-module {
  cp -R /input /tmp
  export-vars ${PLATFORM}
  PARMS="${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m"
-  if [ -f "/tmp/input/defines.${1}" ]
-  then
+  if [ -f "/tmp/input/defines.${1}" ]; then
    PARMS+=" `cat "/tmp/input/defines.${1}" | xargs`"
  fi
  make -j`nproc` -C "/opt/${PLATFORM}/build" M="/tmp/input" ${PARMS} modules
--- a/files/board/arpl/kernel_defconfig
+++ b/files/board/arpl/kernel_defconfig
@@ -18,6 +18,7 @@ CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_NAMESPACES=y
+CONFIG_SYSFS_DEPRECATED=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_GZIP is not set
 # CONFIG_RD_BZIP2 is not set
@@ -465,7 +466,9 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
 CONFIG_HUGETLBFS=y
+CONFIG_EFIVAR_FS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
--- a/files/board/arpl/overlayfs/opt/arpl/boot.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh
@@ -18,9 +18,6 @@ printf "\033[1;44m%*s\033[0m\n" ${COLUMNS} ""
 TITLE="BOOTING..."
 printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"

-history -w
-sync
-
 # Check if DSM zImage changed, patch it if necessary
 ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`"
 if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ]; then
@@ -29,7 +26,7 @@ if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ];
  if [ $? -ne 0 ]; then
    dialog --backtitle "`backtitle`" --title "Error" \
      --msgbox "zImage not patched:\n`<"${LOG_FILE}"`" 12 70
-    return 1
+    exit 1
  fi
 fi

@@ -41,7 +38,7 @@ if [ "`sha256sum "${ORI_RDGZ_FILE}" | awk '{print$1}'`" != "${RAMDISK_HASH}" ];
  if [ $? -ne 0 ]; then
    dialog --backtitle "`backtitle`" --title "Error" \
      --msgbox "Ramdisk not patched:\n`<"${LOG_FILE}"`" 12 70
-    return 1
+    exit 1
  fi
 fi

@@ -142,8 +139,7 @@ if [ "${DIRECT}" = "true" ]; then
  echo -e "\033[1;33mReboot to boot directly in DSM\033[0m"
  grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct"
  reboot
-  sleep 100
-  exit
+  exit 0
 fi
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"

@@ -156,4 +152,4 @@ else
 fi
 echo -e "\033[1;37mBooting...\033[0m"
 poweroff
-while true; do sleep 1; done # infinity loop
+exit 0
--- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
@@ -1,5 +1,5 @@

-ARPL_VERSION="1.0-beta12"
+ARPL_VERSION="1.0-beta13a"

 # Define paths
 TMP_PATH="/tmp"
--- a/files/board/arpl/overlayfs/opt/arpl/init.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/init.sh
@@ -158,7 +158,9 @@ elif grep -q "IWANTTOCHANGETHECONFIG" /proc/cmdline; then
 fi

 # If is to boot automatically, do it
-[ ${BOOT} -eq 1 ] && boot.sh
+if [ ${BOOT} -eq 1 ]; then 
+  boot.sh && exit 0
+fi

 # Wait for an IP
 COUNT=0
--- a/files/board/arpl/overlayfs/opt/arpl/menu.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -1162,7 +1162,7 @@ function updateMenu() {

 if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${BUILD}" -a loaderIsConfigured ]; then
  make
-  boot
+  boot && exit 0 || sleep 5
 fi
 # Main loop
 NEXT="m"
@@ -1206,7 +1206,7 @@ while true; do
    i) synoinfoMenu; NEXT="v" ;;
    v) advancedMenu; NEXT="d" ;;
    d) make; NEXT="b" ;;
-    b) boot ;;
+    b) boot && exit 0 || sleep 5 ;;
    k) keymapMenu ;;
    c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \
      --prgbox "rm -rfv \"${CACHE_PATH}/dl\"" 0 0 ;;
@@ -1216,4 +1216,3 @@ while true; do
 done
 clear
 echo -e "Call \033[1;32mmenu.sh\033[0m to return to menu"
-
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml
@@ -6,6 +6,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  intel_iommu: igfx_off
  HddEnableDynamicPower: 1
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
@@ -6,6 +6,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  SMBusHddDynamicPower: 1
  syno_hdd_powerup_seq: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
@@ -2,12 +2,12 @@ id: "DS2422+"
 synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
-  supportraidgroup: "no"
  supportssdcache: "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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  SMBusHddDynamicPower: 1
  vender_format_version: 2
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
@@ -2,13 +2,13 @@ id: "DS3615xs"
 synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
-  supportraidgroup: "no"
  supportssdcache: "no"
  esataportcfg: "0x0"
  usbportcfg: "0x8700"
  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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
@@ -2,13 +2,13 @@ id: "DS3617xs"
 synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
-  supportraidgroup: "no"
  supportssdcache: "no"
  esataportcfg: "0x00"
  usbportcfg: "0x8700"
  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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
@@ -9,6 +9,7 @@ synoinfo: &synoinfo
  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"     # http://update7.synology.com/autoupdate/genRSS.php
  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml" # https://update7.synology.com/autoupdate/genRSS.php
  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json" # https://update7.synology.com/autoupdate/v2/getList
+  #supportraidgroup: "no"
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
@@ -9,7 +9,8 @@ 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
+  #support_ssd_cache: "yes"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
@@ -6,6 +6,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  intel_iommu: "igfx_off"
  HddEnableDynamicPower: 1
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
@@ -6,6 +6,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  SMBusHddDynamicPower: 1
  synoboot2:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
@@ -7,6 +7,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  intel_iommu: "igfx_off"
  HddEnableDynamicPower: 1
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml
@@ -10,6 +10,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
@@ -1,13 +1,14 @@
 id: "DVA3221"
 synoinfo: &synoinfo
  support_disk_compatibility: "no"
-  support_memory_compatibility: "no"
+  support_memory_compatibility: "yes"
  esataportcfg: "0x00"
  support_bde_internal_10g: "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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml
@@ -6,6 +6,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  intel_iommu: igfx_off
  SMBusHddDynamicPower: 1
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
@@ -6,10 +6,10 @@ synoinfo: &synoinfo
  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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled
@@ -6,6 +6,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"
+  #supportraidgroup: "no"
 cmdline: &cmdline
  SMBusHddDynamicPower: 1
  synoboot2:
--- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
@@ -139,7 +139,7 @@ echo "export LAYOUT=${LAYOUT}"                  >> "${RAMDISK_PATH}/addons/addon
 echo "export KEYMAP=${KEYMAP}"                  >> "${RAMDISK_PATH}/addons/addons.sh"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"

-# Required addons: eudev, dtbpatch/maxdisks, powersched
+# Required addons: eudev, dtbpatch/maxdisks, wol
 installAddon eudev
 echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 if [ "${DT}" = "true" ]; then
@@ -149,8 +149,8 @@ else
  installAddon maxdisks
  echo "/addons/maxdisks.sh \${1} ${MAXDISKS}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 fi
-installAddon powersched
-echo "/addons/powersched.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
+installAddon wol
+echo "/addons/wol.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 # User addons
 for ADDON in ${!ADDONS[@]}; do
  PARAMS=${ADDONS[${ADDON}]}
--- a/files/board/arpl/p1/ARPL-VERSION
+++ b/files/board/arpl/p1/ARPL-VERSION
@@ -1 +1 @@
-1.0-beta12
+1.0-beta13a
Author	SHA1	Message	Date
Fabio Belavenuto	8df97f2cf7	Merge pull request #530 from fbelavenuto/beta13a Testing new system addon 'wol'	2023-01-23 13:42:27 -03:00
Fabio Belavenuto	1cc8488d44	Testing new system addon 'wol'	2023-01-23 13:42:12 -03:00
Fabio Belavenuto	630cd019db	Merge pull request #525 from fbelavenuto/supportraidgroup Organizing synoinfo "supportraidgroup"	2023-01-20 19:27:12 -03:00
Fabio Belavenuto	68ceba090d	Organizing synoinfo "supportraidgroup"	2023-01-20 19:26:39 -03:00
Fabio Belavenuto	10a3390eda	Merge pull request #524 from fbelavenuto/boot-improving Boot improving, arpl kernel config	2023-01-20 15:00:51 -03:00
Fabio Belavenuto	14dee10280	Changing arpl kernel config	2023-01-20 15:00:01 -03:00
Fabio Belavenuto	e0d6f5487e	Improving DSM boot	2023-01-20 14:58:39 -03:00