Merge pull request #74 from fbelavenuto/dev

Dev
2025-06-21 05:51:05 +08:00 · 2022-08-05 15:31:31 -03:00 · 2022-08-05 15:31:31 -03:00 · 176f2e5fe5
commit 176f2e5fe5
parent effdeab2e9 e1974c7bd2
33 changed files with 186 additions and 20 deletions
--- a/docker/files/opt/do.sh
+++ b/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" \
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled
@ -19,6 +19,7 @@ cmdline: &cmdline
  syno_ttyS0: "serial,0x3f8"
  syno_ttyS1: "serial,0x2f8"
 platform: "geminilake"
+unique: "synology_geminilake_1520+"
 dom: 2
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
@ -22,6 +22,7 @@ cmdline: &cmdline
  syno_ttyS0: "serial,0x3f8"
  syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+unique: "synology_v1000_1621+"
 dom: 2
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
@ -22,6 +22,7 @@ cmdline: &cmdline
  syno_ttyS0: "serial,0x3f8"
  syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+unique: "synology_v1000_2422+"
 dom: 2
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
@ -18,6 +18,7 @@ cmdline: &cmdline
  syno_port_thaw: 1
  syno_hdd_detect: 0
 platform: "bromolow"
+unique: "synology_bromolow_3615xs"
 serial:
  prefix:
    - "1130"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
@ -22,6 +22,7 @@ cmdline: &cmdline
  syno_port_thaw: 1
  syno_hdd_detect: 0
 platform: "broadwell"
+unique: "synology_broadwell_3617xs"
 dom: 1
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
@ -6,15 +6,16 @@ synoinfo: &synoinfo
  supportssdcache: "no"
  esataportcfg: "0x00"
  support_bde_internal_10g: "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"
+  support_oob_ctl: "no"
+  rss_server: "http://example.com/null.xml"                   # http://update7.synology.com/autoupdate/genRSS.php
+  rss_server_ssl: "https://example.com/null.xml"              # https://update7.synology.com/autoupdate/genRSS.php
+  rss_server_v2: "https://example.com/autoupdate/v2/getList"  # https://update7.synology.com/autoupdate/v2/getList
+  update_server: "http://example.com/"                        # http://update7.synology.com/
+  update_server_ssl: "https://example.com/"                   # https://update7.synology.com/
+  small_info_path: "https://example.com/null"                 # https://update7.synology.com/smallupdate
+  updateurl: "http://example.com/"                            # http://www.synology.com/
+  myds_region_api_base_url: "https://example.com"             # https://account.synology.com/
+  security_version_server: "https://example.com/smallupdate"  # https://update7.synology.com/securityVersion
 cmdline: &cmdline
  syno_hdd_powerup_seq: 0
  HddHotplug: 0
@ -22,6 +23,7 @@ cmdline: &cmdline
  syno_port_thaw: 1
  syno_hdd_detect: 0
 platform: "broadwellnk"
+unique: "synology_broadwellnk_3622xs+"
 dom: 1
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
@ -22,6 +22,7 @@ cmdline: &cmdline
  syno_port_thaw: 1
  syno_hdd_detect: 0
 platform: "apollolake"
+unique: "synology_apollolake_918+"
 dom: 2
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
@ -19,6 +19,7 @@ cmdline: &cmdline
  syno_ttyS1: "serial,0x2f8"
  vender_format_version: 2
 platform: "geminilake"
+unique: "synology_geminilake_920+"
 dom: 2
 dt: true
 serial:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
@ -21,6 +21,7 @@ cmdline: &cmdline
  syno_ttyS0: "serial,0x3f8"
  syno_ttyS1: "serial,0x2f8"
 platform: "geminilake"
+unique: "synology_geminilake_dva1622"
 dom: 2
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
@ -20,6 +20,7 @@ cmdline: &cmdline
  syno_port_thaw: 1
  syno_hdd_detect: 0
 platform: "denverton"
+unique: "synology_denverton_dva3221"
 dom: 2
 serial:
  prefix:
--- a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-init-script.patch
+++ b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-init-script.patch
@ -1,6 +1,16 @@
--- 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 @@
+diff -uN a/linuxrc.syno.impl b/linuxrc.syno.impl
+--- a/linuxrc.syno.impl	2022-08-05 10:50:18.011496401 -0300
+++ b/linuxrc.syno.impl	2022-08-05 11:20:47.861013234 -0300
+@@ -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 +18,21 @@
 
 	exit $1
 }
-@@ -155,6 +156,8 @@
- # insert basic USB modules for detect f401/FDT
+@@ -156,6 +159,8 @@
 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
+ if [ $KERNEL_VCODE -ge $(KernelVersionCode "3.10") ]; then
+@@ -209,6 +214,8 @@
 		fi
 fi
-
+ 
 +/addons/addons.sh patches
+
 if [ "$SupportDualhead" = "yes" ]; then
 	# Run HA script
 	/etc.defaults/AHAtasks check_stage
--- a/files/board/arpl/p3/addons/9p/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/9p/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/9p/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/9p/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/9p/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/9p/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/9p/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/9p/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/9p/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/9p/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/9p/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/9p/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/9p/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/9p/v1000-4.4.180.tgz
--- a/files/board/arpl/p3/addons/acpid/all.tgz
+++ b/files/board/arpl/p3/addons/acpid/all.tgz
--- a/files/board/arpl/p3/addons/dtbpatch/all.tgz
+++ b/files/board/arpl/p3/addons/dtbpatch/all.tgz
--- a/files/board/arpl/p3/addons/eudev/all.tgz
+++ b/files/board/arpl/p3/addons/eudev/all.tgz
--- a/files/board/arpl/p3/addons/i915/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/i915/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/maxdisks/all.tgz
+++ b/files/board/arpl/p3/addons/maxdisks/all.tgz
--- a/files/board/arpl/p3/addons/misc/all.tgz
+++ b/files/board/arpl/p3/addons/misc/all.tgz
--- a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/modules/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/modules/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/modules/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/modules/v1000-4.4.180.tgz
--- a/rss.xml
+++ b/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>