Merge pull request #92 from fbelavenuto/88-dva3219-loader

Added as beta: DVA3219, DS1520+, FS2500, RS4021xs+

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

@@ -59,6 +59,7 @@ function backtitle() {
 # Shows available models to user choose one
 function modelMenu() {
   RESTRICT=1
+  FLGBETA=0
   while true; do
     echo "" > "${TMP_PATH}/menu"
     FLGNEX=0
@@ -67,6 +68,8 @@ function modelMenu() {
       M="${M::-4}"
       PLATFORM=`readModelKey "${M}" "platform"`
       DT="`readModelKey "${M}" "dt"`"
+      BETA="`readModelKey "${M}" "beta"`"
+      [ "${BETA}" = "true" -a ${FLGBETA} -eq 0 ] && continue
       # Check id model is compatible with CPU
       COMPATIBLE=1
       if [ ${RESTRICT} -eq 1 ]; then
@@ -82,6 +85,7 @@ function modelMenu() {
       [ ${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"
+    [ ${FLGBETA} -eq 0 ] && echo "b \"\Z1Show beta models\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
@@ -91,6 +95,10 @@ function modelMenu() {
       RESTRICT=0
       continue
     fi
+    if [ "${resp}" = "b" ]; then
+      FLGBETA=1
+      continue
+    fi
     # If user change model, clean buildnumber and S/N
     if [ "${MODEL}" != "${resp}" ]; then
       MODEL=${resp}
@@ -163,8 +171,9 @@ function serialMenu() {
         elif [ `validateSerial ${MODEL} ${SERIAL}` -eq 1 ]; then
           break
         fi
-        dialog --backtitle "`backtitle`" \
-          --msgbox "Invalid serial, please type a right one" 0 0
+        dialog --backtitle "`backtitle`" --title "Alert" \
+          --yesno "Invalid serial, continue?" 0 0
+        [ $? -eq 0 ] && break
       done
       break
     elif [ "${resp}" = "a" ]; then

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

@@ -16,6 +16,7 @@ cmdline: &cmdline
   syno_ttyS1: "serial,0x2f8"
 platform: "geminilake"
 unique: "synology_geminilake_1520+"
+beta: true
 dom: 2
 serial:
   prefix:

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

@@ -0,0 +1,90 @@
+id: "DVA3219"
+synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  esataportcfg: "0x00"
+  support_bde_internal_10g: "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
+  syno_hdd_powerup_seq: 0
+  HddHotplug: 0
+  vender_format_version: 2
+  syno_port_thaw: 1
+  syno_hdd_detect: 0
+platform: "denverton"
+unique: "synology_denverton_dva3219"
+beta: true
+dom: 2
+serial:
+  prefix:
+    - "1930"
+    - "1940"
+  middle: "RFR"
+  suffix: "alpha"
+flags:
+  - "fma"
+disks: 4
+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_DVA3219_42218.pat"
+      hash: "3557df23ff6af9bbb0cf46872ba2fc09c344eb303a38e8283dbc9a46e5eae979"
+      ramdisk-hash: "6820f900bf2870660541b83f9741a0b70e05e8871bc41c006c9d688105c97f7c"
+      zimage-hash: "ef97f2d64f3f7f8c5e3f4e8fee613d385d7888826f56e119f1885a722c95c7cc"
+    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.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_DVA3219_42661.pat"
+      hash: "01596eaf7310a56b504fde5743262f721dd0be2836e53d2d74386e14f509bec4"
+      ramdisk-hash: "a62ef4468db4e6c7eab04bb810c603c65e201aebbcc8994423b0c95dd215e4c5"
+      zimage-hash: "5222b5efaf7af28ff3833fd37f13100c30acba1ee201a15b2ee360e66e75b48e"
+    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: ""
+    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_DVA3219_42951.pat"
+      hash: "74fc31feb6788ace9ae2ea162e77fb273ae503acecf58abcaa8d60380be2d4ab"
+      ramdisk-hash: "cbaee3c024e6c4752aca2a8e37d8e0bbaae6740c19c633a5fb2d1ecf2e8fb253"
+      zimage-hash: "fb4f70d6f67f77b99973113208590363efcdc6c5856c3a5efb85abd75d750260"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42951-post-init-script.patch"
+      - "ramdisk-42661-disable-disabled-ports.patch"

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

@@ -16,6 +16,7 @@ cmdline: &cmdline
   syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
 unique: "synology_v1000_fs2500"
+beta: true
 dom: 2
 serial:
   prefix:

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

@@ -1,4 +1,4 @@
-id: "RS4021+"
+id: "RS4021xs+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
@@ -7,7 +7,7 @@ synoinfo: &synoinfo
   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"
+  support_bde_internal_10g: "no"
   esataportcfg: "0x0"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
@@ -16,7 +16,8 @@ cmdline: &cmdline
   syno_port_thaw: 1
   vender_format_version: 2
 platform: "broadwellnk"
-unique: "synology_broadwellnk_rs4021+"
+unique: "synology_broadwellnk_rs4021xs+"
+beta: true
 dom: 2
 serial:
   prefix:

img-gen.sh

@@ -14,10 +14,17 @@ rm -rf ".buildroot/board/arpl/p3"
 
 # Get latest LKMs
 echo "Getting latest LKMs"
-TAG=`curl -s https://api.github.com/repos/fbelavenuto/redpill-lkm/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
-curl -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
-rm -rf files/board/arpl/p3/lkms/*
-unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
+if [ `ls ../redpill-lkm/output | wc -l` -eq 0 ]; then
+  echo "  Downloading from github"
+  TAG=`curl -s https://api.github.com/repos/fbelavenuto/redpill-lkm/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+  curl -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
+  rm -rf files/board/arpl/p3/lkms/*
+  unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
+else
+  echo "  Copying from ../redpill-lkm/output"
+  rm -rf files/board/arpl/p3/lkms/*
+  cp -f ../redpill-lkm/output/* files/board/arpl/p3/lkms
+fi
 
 # Get latest addons and install its
 echo "Getting latest Addons"

new_bn.sh

@@ -14,14 +14,15 @@ KVERS["DS3615xs"]="3.10.108"
 KVERS["DS3617xs"]="4.4.180"
 KVERS["DS3622xs+"]="4.4.180"
 KVERS["DVA1622"]="4.4.180"
+KVERS["DVA3219"]="4.4.180"
 KVERS["DVA3221"]="4.4.180"
 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
+for MODEL in DS918+ DS920+ DS1520+ DS1621+ DS2422+ DS3615xs DS3617xs DS3622xs+ DVA1622 DVA3221 DVA3219 FS2500 RS4021xs+; do
   MODEL_CODED=`echo ${MODEL} | sed 's/+/%2B/g'`
   URL="https://global.download.synology.com/download/DSM/release/${RELEASE}/${BUILDNUMBER}${EXTRA}/DSM_${MODEL_CODED}_${BUILDNUMBER}.pat"
   FILENAME="${MODEL}-${BUILDNUMBER}.pat"

rss.json

@@ -21,6 +21,16 @@
         "ReqBuildDate": "2021/06/25",
         "isSecurityVersion": false,
         "model": [
+          {
+            "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_1520+",
             "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat",
@@ -46,16 +56,6 @@
             "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",
@@ -77,9 +77,9 @@
             "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"
+            "mUnique": "synology_broadwellnk_rs4021xs+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_RS4021xs%2B_42661.pat",
+            "mCheckSum": "ddbbbcf8ccb8d9d345df3e08debc66f6"
           }
         ]
       },
@@ -98,6 +98,16 @@
         "ReqBuildDate": "2018/05/19",
         "isSecurityVersion": false,
         "model": [
+          {
+            "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_geminilake_1520+",
             "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat",
@@ -123,16 +133,6 @@
             "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",
@@ -144,9 +144,9 @@
             "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"
+            "mUnique": "synology_broadwellnk_rs4021xs+",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat",
+            "mCheckSum": "46d9eb6aba71dbd61ba0394e575b6d58"
           }
         ]
       }