Merge pull request #76 from fbelavenuto/dev

wip

.github/workflows/main.yml

@@ -101,7 +101,7 @@ jobs:
           path: |
             arpl.img
             arpl.vmdk
-          retention-days: 1
+          retention-days: 5
 
       # Publish a release if is a tag
       - name: Release

TODO

@@ -1,5 +1,5 @@
 A fazer
- - Descobrir como é o serial do DS2422+
+ - Checar se tem como atualizar microcode via addon/modules/whatever...
  - Estudar acrescentar modo simples e avançado do menu
 
 Concluidos:
@@ -27,3 +27,5 @@ Concluidos:
  - Acertar flag DIRTY ao atualizar módulos, etc
  - Consertar MAC custom
  - Mudar synoinfo para ler do modelo e preencher no user_config, para usuário poder deletar entradas do modelo
+ - Validar netif_num e macX
+ - Descobrir como é o serial do DS2422+

VERSION

@@ -1 +1 @@
-0.3-alpha5
+0.3-alpha8

docker/files/opt/do.sh

@@ -32,7 +32,7 @@ function compile-module {
     echo "Platform ${1} not found."
     exit 1
   fi
-  echo "Compiling module for ${PLATFORM}-${KVER}..."
+  echo -e "Compiling module for \033[7m${PLATFORM}-${KVER}\033[0m..."
   cp -R /input /tmp
   export-vars ${PLATFORM}
   make -C "/opt/${PLATFORM}/build" M="/tmp/input" \

files/board/arpl/overlayfs/etc/samba/smb.conf

@@ -0,0 +1,18 @@
+[global]
+  workgroup = WORKGROUP
+  server role = standalone server
+  obey pam restrictions = yes
+  map to guest = Bad User
+  usershare allow guests = yes
+[arpl]
+  browseable = yes
+  public = yes
+  path = /mnt
+  guest ok = yes
+  printable = no
+  read only = no
+  writable = yes
+  create mask = 0600
+  directory mask = 0700
+  force user = root
+  force group = root

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

@@ -48,6 +48,9 @@ MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
 BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
 SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
 
+echo -e "Model: \033[1;36m${MODEL}\033[0m"
+echo -e "Build: \033[1;36m${BUILD}\033[0m"
+
 declare -A CMDLINE
 
 # Fixed values
@@ -82,6 +85,17 @@ if [ "${BUS}" = "ata" ]; then
   DOM="`readModelKey "${MODEL}" "dom"`"
 fi
 
+# Validate netif_num
+NETIF_NUM=${CMDLINE["netif_num"]}
+MACS=0
+for N in `seq 1 4`; do
+  [ -n "${CMDLINE["mac${N}"]}" ] && MACS=$((${MACS}+1))
+done
+if [ ${NETIF_NUM} -ne ${MACS} ]; then
+  echo -e "\033[1;33m*** netif_num is not equal to macX amount, set netif_num to ${MACS} ***\033[0m"
+  CMDLINE["netif_num"]=${MACS}
+fi
+
 # Prepare command line
 CMDLINE_LINE=""
 grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
@@ -96,9 +110,6 @@ done
 # Escape special chars
 CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`
 
-# Inform user
-echo -e "Model: \033[1;36m${MODEL}\033[0m"
-echo -e "Build: \033[1;36m${BUILD}\033[0m"
 echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"
 
 # Wait for an IP
@@ -121,7 +132,7 @@ done
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 
 # Executes DSM kernel via KEXEC
-history -a
+history -w
 sync
 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"

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

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.3-alpha5"
+ARPL_VERSION="0.3-alpha8"
 
 # Define paths
 TMP_PATH="/tmp"

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

@@ -56,6 +56,8 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "cmdline" "{}" "${USER_CONFIG_FILE}"
   writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
   writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
+  writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
+  writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
 fi
 
 # Set custom MAC if defined
@@ -159,3 +161,13 @@ echo
 mkdir -p "${ADDONS_PATH}"
 mkdir -p "${LKM_PATH}"
 mkdir -p "${MODULES_PATH}"
+
+# Detect if has new local plugins to install/reinstall
+for F in `ls ${CACHE_PATH}/*.addon 2>/dev/null`; do
+  ADDON=`basename "${F}" | sed 's|.addon||'`
+  rm -rf "${ADDONS_PATH}/${ADDON}"
+  mkdir -p "${ADDONS_PATH}/${ADDON}"
+  echo "Installing ${F} to ${ADDONS_PATH}/${ADDON}"
+  tar xaf "${F}" -C "${ADDONS_PATH}/${ADDON}"
+  rm -f "${F}"
+done

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

@@ -58,38 +58,53 @@ function backtitle() {
 ###############################################################################
 # Shows available models to user choose one
 function modelMenu() {
-  ITEMS=""
-  while read M; do
-    M="`basename ${M}`"
-    M="${M::-4}"
-    PLATFORM=`readModelKey "${M}" "platform"`
-    # Check id model is compatible with CPU
-    COMPATIBLE=1
-    for F in `readModelArray "${M}" "flags"`; do
-      if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
-        COMPATIBLE=0
-        break
+  RESTRICT=1
+  while true; do
+    echo "" > "${TMP_PATH}/menu"
+    FLGNEX=0
+    while read M; do
+      M="`basename ${M}`"
+      M="${M::-4}"
+      PLATFORM=`readModelKey "${M}" "platform"`
+      DT="`readModelKey "${M}" "dt"`"
+      # Check id model is compatible with CPU
+      COMPATIBLE=1
+      if [ ${RESTRICT} -eq 1 ]; then
+        for F in `readModelArray "${M}" "flags"`; do
+          if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
+            COMPATIBLE=0
+            FLGNEX=1
+            break
+          fi
+        done
       fi
-    done
-    [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} ${PLATFORM} "
-  done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
-  dialog --backtitle "`backtitle`" --menu "Choose the model" 0 0 0 \
-    ${ITEMS} 2>${TMP_PATH}/resp
-  [ $? -ne 0 ] && return
-  resp=$(<${TMP_PATH}/resp)
-  [ -z "${resp}" ] && return
-  # If user change model, clean buildnumber and S/N
-  if [ "${MODEL}" != "${resp}" ]; then
-    MODEL=${resp}
-    writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
-    BUILD=""
-    writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
-    SN=""
-    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-    # Delete old files
-    rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
-    DIRTY=1
-  fi
+      [ "${DT}" = "true" ] && DT="-DT" || DT=""
+      [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"\Zb${PLATFORM}${DT}\Zn\" " >> "${TMP_PATH}/menu"
+    done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+    [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1Disable flags restriction\Zn\"" >> "${TMP_PATH}/menu"
+    dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \
+      --file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
+    [ $? -ne 0 ] && return
+    resp=$(<${TMP_PATH}/resp)
+    [ -z "${resp}" ] && return
+    if [ "${resp}" = "f" ]; then
+      RESTRICT=0
+      continue
+    fi
+    # If user change model, clean buildnumber and S/N
+    if [ "${MODEL}" != "${resp}" ]; then
+      MODEL=${resp}
+      writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
+      BUILD=""
+      writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
+      SN=""
+      writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
+      # Delete old files
+      rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
+      DIRTY=1
+    fi
+    break
+  done
 }
 
 ###############################################################################
@@ -324,7 +339,7 @@ function cmdlineMenu() {
         fi
         ITEMS=""
         for I in "${!CMDLINE[@]}"; do
-          ITEMS+="${I} ${CMDLINE[${I}]} off "
+          [ -z "${CMDLINE[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${CMDLINE[${I}]} off "
         done
         dialog --backtitle "`backtitle`" \
           --checklist "Select cmdline to remove" 0 0 0 ${ITEMS} \
@@ -457,7 +472,7 @@ function synoinfoMenu() {
         fi
         ITEMS=""
         for I in "${!SYNOINFO[@]}"; do
-          ITEMS+="${I} ${SYNOINFO[${I}]} off "
+          [ -z "${SYNOINFO[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${SYNOINFO[${I}]} off "
         done
         dialog --backtitle "`backtitle`" \
           --checklist "Select synoinfo entry to remove" 0 0 0 ${ITEMS} \

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

@@ -0,0 +1,64 @@
+id: "DS1520+"
+synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "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"
+  small_info_path: "https://example.com/null"
+  security_version_server: "https://example.com/smallupdate"
+cmdline: &cmdline
+  intel_iommu: igfx_off
+  HddEnableDynamicPower: 1
+  vender_format_version: 2
+  synoboot2:
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+platform: "geminilake"
+unique: "synology_geminilake_1520+"
+dom: 2
+serial:
+  prefix:
+    - "0000"
+  middle: "XXX"
+  suffix: "alpha"
+disks: 6
+dt: true
+builds:
+  42218:
+    ver: "7.0.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.0.1/42218/DSM_DS1520%2B_42218.pat"
+      hash: "06947c58f25bd591f7fa3c58ad9473777481bdd7a049b42d1cb585ca01b053ee"
+      ramdisk-hash: "f0a275587c51acdb4d58a7f0d82d70f31e54228d0fbf7575d5d425dae75d1969"
+      zimage-hash: "74d513aaa3e30d8aa4f80e202d94a68a552e9c0472f8470e133ad29080556f55"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-post-init-script.patch"
+
+  42661:
+    ver: "7.1.0"
+    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/42661-1/DSM_DS1520%2B_42661.pat"
+      hash: "3a8499c5f72d7241b81781ec741d4019eaa506e6e7a4fd17ce54fb149f6ffae6"
+      ramdisk-hash: "b18f14b8420a217d7b6dd3696786ecccfbe7c325d342475531a68a7df831cffc"
+      zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42661-post-init-script.patch"

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

@@ -2,14 +2,10 @@ id: "DS1621+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
+  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"
   small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
   security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
@@ -22,6 +18,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+unique: "synology_v1000_1621+"
 dom: 2
 serial:
   prefix:

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

@@ -2,17 +2,13 @@ id: "DS2422+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  security_version_server: "https://example.com/smallupdate"
   supportraidgroup: "no"
   supportssdcache: "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"
+  small_info_path: "https://example.com/null"
+  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   vender_format_version: 2
@@ -22,11 +18,13 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+unique: "synology_v1000_2422+"
 dom: 2
 serial:
   prefix:
-    - "0000"
-  middle: "XXX"
+    - "2140"
+    - "2180"
+  middle: "SLR"
   suffix: "numeric"
 disks: 12
 dt: true

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

@@ -1,16 +1,14 @@
 id: "DS3615xs"
 synoinfo: &synoinfo
-  esataportcfg: "0x0"
-  usbportcfg: "0x8700"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
   supportraidgroup: "no"
   supportssdcache: "no"
+  esataportcfg: "0x0"
+  usbportcfg: "0x8700"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  small_info_path: "https://example.com/null"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
@@ -18,6 +16,7 @@ cmdline: &cmdline
   syno_port_thaw: 1
   syno_hdd_detect: 0
 platform: "bromolow"
+unique: "synology_bromolow_3615xs"
 serial:
   prefix:
     - "1130"

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

@@ -1,20 +1,15 @@
 id: "DS3617xs"
 synoinfo: &synoinfo
-  esataportcfg: "0x00"
-  usbportcfg: "0x8700"
-  rss_server: "http://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  rss_server_ssl: "https://example.com/null.xml"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  security_version_server: "https://example.com/smallupdate"
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
   supportraidgroup: "no"
   supportssdcache: "no"
+  esataportcfg: "0x00"
+  usbportcfg: "0x8700"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  small_info_path: "https://example.com/null"
+  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
@@ -22,6 +17,7 @@ cmdline: &cmdline
   syno_port_thaw: 1
   syno_hdd_detect: 0
 platform: "broadwell"
+unique: "synology_broadwell_3617xs"
 dom: 1
 serial:
   prefix:

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

@@ -1,20 +1,17 @@
 id: "DS3622xs+"
 synoinfo: &synoinfo
-  esataportcfg: "0x00"
-  support_bde_internal_10g: "no"
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
   supportraidgroup: "no"
   supportssdcache: "no"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  security_version_server: "https://example.com/smallupdate"
+  esataportcfg: "0x00"
+  support_bde_internal_10g: "no"
+  support_oob_ctl: "no"
+  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
+  small_info_path: "https://example.com/null"                                       # https://update7.synology.com/smallupdate
+  security_version_server: "https://example.com/smallupdate"                        # https://update7.synology.com/securityVersion
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
@@ -22,6 +19,7 @@ cmdline: &cmdline
   syno_port_thaw: 1
   syno_hdd_detect: 0
 platform: "broadwellnk"
+unique: "synology_broadwellnk_3622xs+"
 dom: 1
 serial:
   prefix:

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

@@ -1,17 +1,15 @@
 id: "DS918+"
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
   esataportcfg: "0x00"
   support_led_brightness_adjustment: ""
   support_leds_lp3943: ""
   buzzeroffen: "0xffff"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
+  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"
   small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
   security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
@@ -20,6 +18,7 @@ cmdline: &cmdline
   syno_port_thaw: 1
   syno_hdd_detect: 0
 platform: "apollolake"
+unique: "synology_apollolake_918+"
 dom: 2
 serial:
   prefix:

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

@@ -1,13 +1,11 @@
 id: "DS920+"
 synoinfo: &synoinfo
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "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"
   small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
   security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
@@ -17,6 +15,7 @@ cmdline: &cmdline
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
 platform: "geminilake"
+unique: "synology_geminilake_920+"
 dom: 2
 dt: true
 serial:

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

@@ -1,14 +1,12 @@
 id: "DVA1622"
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
   buzzeroffen: "0xffff"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
+  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"
   small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
   security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
@@ -19,6 +17,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "geminilake"
+unique: "synology_geminilake_dva1622"
 dom: 2
 serial:
   prefix:

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

@@ -1,16 +1,13 @@
 id: "DVA3221"
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
   esataportcfg: "0x00"
   support_bde_internal_10g: "no"
-  support_disk_compatibility: "no"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  update_server_ssl: "https://example.com/"
+  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"
   small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
   security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
@@ -19,6 +16,7 @@ cmdline: &cmdline
   syno_port_thaw: 1
   syno_hdd_detect: 0
 platform: "denverton"
+unique: "synology_denverton_dva3221"
 dom: 2
 serial:
   prefix:

files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-init-script.patch

@@ -1,6 +1,15 @@
---- a/linuxrc.syno.impl	2022-07-13 19:11:36.166689682 -0300
-+++ b/linuxrc.syno.impl	2022-07-14 10:50:50.616836807 -0300
-@@ -59,6 +59,7 @@
+--- a/linuxrc.syno.impl
++++ b/linuxrc.syno.impl
+@@ -38,6 +38,8 @@
+ UnknownSynoPartitionMigrationFlag="/.unknown_syno_partition_migrate"
+ IncompatibleRootDevice="/.incompatible_root_device"
+ 
++/addons/addons.sh early
++
+ UmountRoot()
+ {
+ 	grep "^${RootDevice}" /proc/mounts && /bin/umount -f ${Mnt}
+@@ -59,6 +61,7 @@
  	fi
  
  	UmountRoot
@@ -8,21 +17,21 @@
  
  	exit $1
  }
-@@ -155,6 +156,8 @@
+@@ -155,6 +158,8 @@
  # insert basic USB modules for detect f401/FDT
  echo "Insert basic USB modules..."
  SYNOLoadModules $USB_MODULES
-+SYNOLoadModules "usb-storage"
-+/addons/addons.sh early
- 
++
++/addons/addons.sh modules
+
  # insert Etron USB3.0 drivers
  
-@@ -208,7 +211,7 @@
- 			rmmod i2c_core
+@@ -209,6 +214,8 @@
  		fi
  fi
--
+ 
 +/addons/addons.sh patches
++
  if [ "$SupportDualhead" = "yes" ]; then
  	# Run HA script
  	/etc.defaults/AHAtasks check_stage

files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh

@@ -98,7 +98,7 @@ echo -n "."
 # Copying fake modprobe
 cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe"
 # Copying LKM to /usr/lib/modules
-cp "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko" "${RAMDISK_PATH}/usr/lib/modules/rp.ko"
+gzip -dc "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko.gz" > "${RAMDISK_PATH}/usr/lib/modules/rp.ko"
 
 # Addons
 MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"`

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

@@ -0,0 +1,7 @@
+version: 1
+name: i915
+description: "Intel iGPU Drivers (10th Gen)"
+available-for:
+  geminilake-4.4.180:
+    install-script: "install.sh"
+    copy: "geminilake-4.4.180"

files/configs/arpl_defconfig

@@ -26,7 +26,6 @@ BR2_PACKAGE_BINUTILS_TARGET=y
 BR2_PACKAGE_CPIO=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_ACPID=y
 BR2_PACKAGE_KBD=y
@@ -45,6 +44,7 @@ BR2_PACKAGE_PCRE2=y
 BR2_PACKAGE_DHCPCD=y
 BR2_PACKAGE_OPENSSH=y
 # BR2_PACKAGE_OPENSSH_CLIENT is not set
+BR2_PACKAGE_SAMBA4=y
 BR2_PACKAGE_BASH_COMPLETION=y
 BR2_PACKAGE_DIALOG=y
 BR2_PACKAGE_TTYD=y
@@ -62,4 +62,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_R8168=y
 BR2_PACKAGE_R8125=y
-

img-gen.sh

@@ -73,7 +73,8 @@ echo "Version: ${VERSION}"
 echo "Building... Drink a coffee and wait!"
 make BR2_EXTERNAL=../external
 cd -
-qemu-img convert -O vmdk arpl.img arpl.vmdk
+qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img arpl.vmdk
+#qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 [ -x test.sh ] && ./test.sh
 rm -f *.zip
 zip -9 "arpl-${VERSION}.img.zip" arpl.img

rss.json

@@ -0,0 +1,155 @@
+{
+  "version": "2.0",
+  "channel": {
+    "title": "RSS for DSM Auto Update",
+    "link": "https://update.synology.com/autoupdate/v2/getList",
+    "pubDate": "Sat Aug 6 0:18:39 CST 2022",
+    "copyright": "Copyright 2022 Synology Inc",
+    "item": [
+      {
+        "title": "DSM 7.1-42661",
+        "MajorVer": 7,
+        "MinorVer": 1,
+        "NanoVer": 0,
+        "BuildPhase": 0,
+        "BuildNum": 42661,
+        "BuildDate": "2022/04/01",
+        "ReqMajorVer": 7,
+        "ReqMinorVer": 0,
+        "ReqBuildPhase": 0,
+        "ReqBuildNum": 41890,
+        "ReqBuildDate": "2021/06/25",
+        "isSecurityVersion": false,
+        "model": [
+          {
+            "mUnique": "synology_geminilake_1520+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat",
+            "mCheckSum": "1d8ecfcb2a956488ae355c79a72bb9ec"
+          },
+          {
+            "mUnique": "synology_v1000_1621+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS1621%2B_42661.pat",
+            "mCheckSum": "b4b72eb8d4e84b2e2a8c29fc0a1ac6aa"
+          },
+          {
+            "mUnique": "synology_v1000_2422+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat",
+            "mCheckSum": "9ea5e0fe94c01072da36e2f69172abb3"
+          },
+          {
+            "mUnique": "synology_broadwell_3617xs",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS3617xs_42661.pat",
+            "mCheckSum": "94e6263912bc758ee3db81c62a94a8f6"
+          },
+          {
+            "mUnique": "synology_broadwellnk_3622xs+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS3622xs%2B_42661.pat",
+            "mCheckSum": "7af76cca8226ecf95b25630bffa76b3d"
+          },
+          {
+            "mUnique": "synology_apollolake_918+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS918%2B_42661.pat",
+            "mCheckSum": "2c49260d2646a0944b56933f7d4029fb"
+          },
+          {
+            "mUnique": "synology_geminilake_920+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS920%2B_42661.pat",
+            "mCheckSum": "fa3936a53299b1a1142e4c614e2b360c"
+          },
+          {
+            "mUnique": "synology_geminilake_dva1622",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DVA1622_42661.pat",
+            "mCheckSum": "27515a2e7c2f2113ccf8955bf22f3974"
+          },
+          {
+            "mUnique": "synology_denverton_dva3219",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DVA3219_42661.pat",
+            "mCheckSum": "5c4dea4a45d96e1a6d5bcc041d300079"
+          },
+          {
+            "mUnique": "synology_denverton_dva3221",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DVA3221_42661.pat",
+            "mCheckSum": "d433ae251ba95754edde1586851d1e0a"
+          },
+          {
+            "mUnique": "synology_v1000_fs2500",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat",
+            "mCheckSum": "e071c4984d041309f151de29b9ba82b5"
+          },
+          {
+            "mUnique": "synology_purley_fs6400",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_FS6400_42661.pat",
+            "mCheckSum": "030064272d82777681502745fcfa8c48"
+          }
+        ]
+      },
+      {
+        "title": "DSM 7.0.1-42218",
+        "MajorVer": 7,
+        "MinorVer": 0,
+        "NanoVer": 0,
+        "BuildPhase": 0,
+        "BuildNum": 42218,
+        "BuildDate": "2021/10/18",
+        "ReqMajorVer": 6,
+        "ReqMinorVer": 2,
+        "ReqBuildPhase": 0,
+        "ReqBuildNum": 23739,
+        "ReqBuildDate": "2018/05/19",
+        "isSecurityVersion": false,
+        "model": [
+          {
+            "mUnique": "synology_geminilake_1520+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat",
+            "mCheckSum": "f56200a8be1aed4eb287a51b373adb1f"
+          },
+          {
+            "mUnique": "synology_v1000_1621+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS1621%2B_42218.pat",
+            "mCheckSum": "f82cbabbfef3fdf2cba45da77d14959b"
+          },
+          {
+            "mUnique": "synology_v1000_2422+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS2422%2B_42218.pat",
+            "mCheckSum": "9293156f98e642c181aed63b0b3df4c8"
+          },
+          {
+            "mUnique": "synology_broadwell_3617xs",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS3617xs_42218.pat",
+            "mCheckSum": "8972088c38acd07aa92a8b573a1b7bc3"
+          },
+          {
+            "mUnique": "synology_broadwellnk_3622xs+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat",
+            "mCheckSum": "bc0235e45a8423f4c46dc0d9699759b5"
+          },
+          {
+            "mUnique": "synology_apollolake_918+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS918%2B_42218.pat",
+            "mCheckSum": "71c028f92497e4722998e4208fe75774"
+          },
+          {
+            "mUnique": "synology_geminilake_920+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS920%2B_42218.pat",
+            "mCheckSum": "7764ad4fca0a11ae0ebd7ccd4a49e1aa"
+          },
+          {
+            "mUnique": "synology_denverton_dva3219",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DVA3219_42218.pat",
+            "mCheckSum": "40917aaf18d069f862f9536ac5504385"
+          },
+          {
+            "mUnique": "synology_denverton_dva3221",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat",
+            "mCheckSum": "b8bd6562290d06dd3a7360f3af330bec"
+          },
+          {
+            "mUnique": "synology_purley_fs6400",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_FS6400_42218.pat",
+            "mCheckSum": "53d74dffd9e17a4805823c60760e2615"
+          }
+        ]
+      }
+    ]
+  }
+}

rss.xml

@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<rss version="2.0">
+  <channel>
+    <title>RSS for DSM Auto Update</title>
+    <link>http://update.synology.com/autoupdate/genRSS.php</link>
+    <pubDate>Sat Aug 6 0:11:41 CST 2022</pubDate>
+    <copyright>Copyright 2022 Synology Inc</copyright>
+    <item>
+      <title>DSM 7.1-42661</title>
+      <MajorVer>7</MajorVer>
+      <MinorVer>1</MinorVer>
+      <BuildPhase>0</BuildPhase>
+      <BuildNum>42661</BuildNum>
+      <BuildDate>2022/04/01</BuildDate>
+      <ReqMajorVer>7</ReqMajorVer>
+      <ReqMinorVer>0</ReqMinorVer>
+      <ReqBuildPhase>0</ReqBuildPhase>
+      <ReqBuildNum>41890</ReqBuildNum>
+      <ReqBuildDate>2021/06/25</ReqBuildDate>
+      <model>
+        <mUnique>synology_geminilake_1520+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat</mLink>
+        <mCheckSum>1d8ecfcb2a956488ae355c79a72bb9ec</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_v1000_1621+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS1621%2B_42661.pat</mLink>
+        <mCheckSum>b4b72eb8d4e84b2e2a8c29fc0a1ac6aa</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_v1000_2422+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat</mLink>
+        <mCheckSum>9ea5e0fe94c01072da36e2f69172abb3</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_broadwell_3617xs</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS3617xs_42661.pat</mLink>
+        <mCheckSum>94e6263912bc758ee3db81c62a94a8f6</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_broadwellnk_3622xs+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS3622xs%2B_42661.pat</mLink>
+        <mCheckSum>7af76cca8226ecf95b25630bffa76b3d</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_apollolake_918+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS918%2B_42661.pat</mLink>
+        <mCheckSum>2c49260d2646a0944b56933f7d4029fb</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_geminilake_920+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS920%2B_42661.pat</mLink>
+        <mCheckSum>fa3936a53299b1a1142e4c614e2b360c</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_geminilake_dva1622</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DVA1622_42661.pat</mLink>
+        <mCheckSum>27515a2e7c2f2113ccf8955bf22f3974</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_denverton_dva3219</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DVA3219_42661.pat</mLink>
+        <mCheckSum>5c4dea4a45d96e1a6d5bcc041d300079</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_denverton_dva3221</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DVA3221_42661.pat</mLink>
+        <mCheckSum>d433ae251ba95754edde1586851d1e0a</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_v1000_fs2500</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat</mLink>
+        <mCheckSum>e071c4984d041309f151de29b9ba82b5</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_purley_fs6400</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_FS6400_42661.pat</mLink>
+        <mCheckSum>030064272d82777681502745fcfa8c48</mCheckSum>
+      </model>
+    </item>
+    <item>
+      <title>DSM 7.0.1-42218</title>
+      <MajorVer>7</MajorVer>
+      <MinorVer>0</MinorVer>
+      <BuildPhase>0</BuildPhase>
+      <BuildNum>42218</BuildNum>
+      <BuildDate>2021/10/18</BuildDate>
+      <ReqMajorVer>6</ReqMajorVer>
+      <ReqMinorVer>2</ReqMinorVer>
+      <ReqBuildPhase>0</ReqBuildPhase>
+      <ReqBuildNum>23739</ReqBuildNum>
+      <ReqBuildDate>2018/05/19</ReqBuildDate>
+      <model>
+        <mUnique>synology_geminilake_1520+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat</mLink>
+        <mCheckSum>f56200a8be1aed4eb287a51b373adb1f</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_v1000_1621+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS1621%2B_42218.pat</mLink>
+        <mCheckSum>f82cbabbfef3fdf2cba45da77d14959b</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_v1000_2422+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS2422%2B_42218.pat</mLink>
+        <mCheckSum>9293156f98e642c181aed63b0b3df4c8</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_broadwell_3617xs</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS3617xs_42218.pat</mLink>
+        <mCheckSum>8972088c38acd07aa92a8b573a1b7bc3</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_broadwellnk_3622xs+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat</mLink>
+        <mCheckSum>bc0235e45a8423f4c46dc0d9699759b5</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_apollolake_918+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS918%2B_42218.pat</mLink>
+        <mCheckSum>71c028f92497e4722998e4208fe75774</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_geminilake_920+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS920%2B_42218.pat</mLink>
+        <mCheckSum>7764ad4fca0a11ae0ebd7ccd4a49e1aa</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_denverton_dva3219</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DVA3219_42218.pat</mLink>
+        <mCheckSum>40917aaf18d069f862f9536ac5504385</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_denverton_dva3221</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat</mLink>
+        <mCheckSum>b8bd6562290d06dd3a7360f3af330bec</mCheckSum>
+      </model>
+      <model>
+        <mUnique>synology_purley_fs6400</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_FS6400_42218.pat</mLink>
+        <mCheckSum>53d74dffd9e17a4805823c60760e2615</mCheckSum>
+      </model>
+    </item>
+  </channel>
+</rss>