Merge pull request #90 from fbelavenuto/tests-fs2500

Tests fs2500
2025-06-21 05:51:05 +08:00 · 2022-08-11 13:14:52 -03:00 · 2022-08-11 13:14:52 -03:00 · bde2a2d3a8
commit bde2a2d3a8
parent 61350bc281 93ff10eeee
9 changed files with 173 additions and 8 deletions
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled
@ -81,4 +81,3 @@ builds:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
      - "ramdisk-42951-post-init-script.patch"
-      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
@ -84,4 +84,3 @@ builds:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
      - "ramdisk-42951-post-init-script.patch"
-      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
@ -84,4 +84,3 @@ builds:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
      - "ramdisk-42951-post-init-script.patch"
-      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
@ -84,5 +84,3 @@ builds:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
      - "ramdisk-42951-post-init-script.patch"
-      - "ramdisk-42661-disable-disabled-ports.patch"
-
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
@ -67,4 +67,3 @@ builds:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
      - "ramdisk-42951-post-init-script.patch"
-      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml.disabled
@ -0,0 +1,83 @@
+id: "FS2500"
+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
+  SMBusHddDynamicPower: 1
+  vender_format_version: 2
+  synoboot2:
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+platform: "v1000"
+unique: "synology_v1000_fs2500"
+dom: 2
+serial:
+  prefix:
+    - "0000"
+  middle: "XXX"
+  suffix: "alpha"
+disks: 12
+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_FS2500_42218.pat"
+      hash: "4d060be8afec548fdb042bc8095524f10ff200033cab74df37ae07f3de5eaa69"
+      ramdisk-hash: "cbe9099c57f23ba53415574b011580218fa55a0bdb83c4e4bba9e27100e5379d"
+      zimage-hash: "f6816165a52b1f53ce44a45878fe06641da34e9478947f826a236c1a6548f8fd"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-post-init-script.patch"
+
+  42661:
+    ver: "7.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    efi-bug: no
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat"
+      hash: "f8343ac070b43fe62d02af6ac9a9c61f8c9852b6b2c79b933629409113e1d3e6"
+      ramdisk-hash: "698e9b1d719d3032a9a2b91ca08078c632b3265590147b2f6c9ca200c826e987"
+      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42661-post-init-script.patch"
+      
+  42951:
+    ver: "7.1.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    efi-bug: no
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_FS2500_42951.pat"
+      hash: "a878c928d7133c3bf3e10e8d3fb43ca7449a57f01d240a3c80de51cdd43af5c3"
+      ramdisk-hash: "a248103b1b47f800753b627394af8768698b74944d156cb6e40c80cd6ba8556f"
+      zimage-hash: "d28951da0eb41286fbe37ffdfc880271787573d68226e5d26321819cf2d2e6e2"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42951-post-init-script.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021+.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021+.yml.disabled
@ -0,0 +1,87 @@
+id: "RS4021+"
+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"
+  support_bde_internal_10g": "no"
+  esataportcfg: "0x0"
+cmdline: &cmdline
+  syno_hdd_powerup_seq: 0
+  HddHotplug: 0
+  syno_hdd_detect: 0
+  syno_port_thaw: 1
+  vender_format_version: 2
+platform: "broadwellnk"
+unique: "synology_broadwellnk_rs4021+"
+dom: 2
+serial:
+  prefix:
+    - "0000"
+  middle: "XXX"
+  suffix: "alpha"
+disks: 16
+dt: false
+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_RS4021xs%2B_42218.pat"
+      hash: "7afca3970ac7324d7431c1484d4249939bedd4c18ac34187f894c43119edf3a1"
+      ramdisk-hash: "3aa9d810064747fca6d0a3ab4c979bd82b49fc0d166dfe714261c2a22145cc70"
+      zimage-hash: "17607e1739c8acc9903272ebd981bccb27b51057cdcb3cc446e5c5149db452d3"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-post-init-script.patch"
+      - "ramdisk-common-disable-disabled-ports.patch"
+
+  42661:
+    ver: "7.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    efi-bug: no
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_RS4021xs%2B_42661.pat"
+      hash: "496b64e431dafa34cdebb92da8ac736bf1610fe157f03df7e6d11152d60991f5"
+      ramdisk-hash: "143e475fe73c0adb3377361402b4baad21448476e844e55e16d1ed51ffc4c971"
+      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42661-post-init-script.patch"
+      - "ramdisk-42661-disable-disabled-ports.patch"
+
+  42951:
+    ver: "7.1.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    efi-bug: no
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_RS4021xs%2B_42951.pat"
+      hash: "7c9e076f3007662f63e34fd478fc48f32dee766f1ddc712f25ae91a2e56e078c"
+      ramdisk-hash: "c4d23a068a66499c50c9772fc5c90cc38dfcba5c45dcab085eda5d07d720046b"
+      zimage-hash: "9134fc61aea7f687d62728470b8847e640693c444e0afd130882b728ab553fea"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42951-post-init-script.patch"
+      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/p3/addons/dtbpatch/all.tgz
+++ b/files/board/arpl/p3/addons/dtbpatch/all.tgz
--- a/new_bn.sh
+++ b/new_bn.sh
@ -19,10 +19,11 @@ KVERS["FS2500"]="4.4.180"
 KVERS["RS4021xs+"]="4.4.180"
 RELEASE="7.1.1"
 BUILDNUMBER="42951"
+EXTRA=""

 for MODEL in DS918+ DS920+ DS1520+ DS1621+ DS2422+ DS3615xs DS3617xs DS3622xs+ DVA1622 DVA3221 FS2500 RS4021xs+; do
  MODEL_CODED=`echo ${MODEL} | sed 's/+/%2B/g'`
-  URL="https://global.download.synology.com/download/DSM/release/${RELEASE}/${BUILDNUMBER}/DSM_${MODEL_CODED}_${BUILDNUMBER}.pat"
+  URL="https://global.download.synology.com/download/DSM/release/${RELEASE}/${BUILDNUMBER}${EXTRA}/DSM_${MODEL_CODED}_${BUILDNUMBER}.pat"
  FILENAME="${MODEL}-${BUILDNUMBER}.pat"
  FILEPATH="/tmp/${FILENAME}"
  echo -n "Checking ${MODEL}... "
@ -31,7 +32,7 @@ for MODEL in DS918+ DS920+ DS1520+ DS1621+ DS2422+ DS3615xs DS3617xs DS3622xs+ D
  else
    STATUS=`curl -s -o /dev/null -w "%{http_code}" -L "${URL}"`
    if [ ${STATUS} -ne 200 ]; then
-      echo "error: HTTP status = %{STATUS}"
+      echo "error: HTTP status = ${STATUS}"
      continue
    fi
    echo "ok, download it."