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

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

VERSION

@@ -1 +1 @@
-0.4-alpha1
+0.4-alpha2

files/board/arpl/make-img.sh

@@ -15,7 +15,7 @@ BOARD_PATH="${CONFIG_DIR}/board/arpl"
 
 echo "Creating image file"
 # Create image zeroed
-dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=300 conv=sync 2>/dev/null
+dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=500 conv=sync 2>/dev/null
 # Copy grub stage1 to image
 dd if="${BOARD_PATH}/grub.bin" of="${IMAGE_FILE}" conv=notrunc,sync 2>/dev/null
 # Create partitions on image

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

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.4-alpha1"
+ARPL_VERSION="0.4-alpha2"
 
 # Define paths
 TMP_PATH="/tmp"

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

@@ -21,6 +21,14 @@ if [ $NUM_PARTITIONS -ne 3 ]; then
   die "Loader disk not found!"
 fi
 
+# Shows title
+clear
+TITLE="Welcome to Automated Redpill Loader v${ARPL_VERSION}"
+printf "\033[1;44m%*s\n" $COLUMNS ""
+printf "\033[1;44m%*s\033[A\n" $COLUMNS ""
+printf "\033[1;32m%*s\033[0m\n" $(((${#TITLE}+$COLUMNS)/2)) "${TITLE}"
+printf "\033[1;44m%*s\033[0m\n" $COLUMNS ""
+
 # Check partitions and ignore errors
 fsck.vfat -aw ${LOADER_DISK}1 >/dev/null 2>&1 || true
 fsck.ext2 -p ${LOADER_DISK}2 >/dev/null 2>&1 || true
@@ -42,6 +50,10 @@ ln -s "${CACHE_PATH}/ssh" "/etc/ssh"
 rm -rf ~/.bash_history
 ln -s ${CACHE_PATH}/.bash_history ~/.bash_history
 
+# Get first MAC address
+MAC=`ip link show eth0 | awk '/ether/{print$2}'`
+MACF=`echo ${MAC} | sed 's/://g'`
+
 # If user config file not exists, initialize it
 if [ ! -f "${USER_CONFIG_FILE}" ]; then
   touch "${USER_CONFIG_FILE}"
@@ -58,12 +70,17 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
   writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
   writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
+  # Initialize with real MAC
+  writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
+  writeConfigKey "cmdline.netif_num" "1" "${USER_CONFIG_FILE}"
+  writeConfigKey "cmdline.mac1" "${MACF}" "${USER_CONFIG_FILE}"
 fi
 
 # Set custom MAC if defined
 MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
-if [ -n "${MAC1}" ]; then
+if [ -n "${MAC1}" -a "${MAC1}" != "${MACF}" ]; then
   MAC="${MAC1:0:2}:${MAC1:2:2}:${MAC1:4:2}:${MAC1:6:2}:${MAC1:8:2}:${MAC1:10:2}"
+  echo "Setting MAC to ${MAC}"
   ip link set dev eth0 address ${MAC} >/dev/null 2>&1 && \
     (/etc/init.d/S41dhcpcd restart >/dev/null 2>&1 &) || true
 fi
@@ -83,14 +100,6 @@ fi
 writeConfigKey "vid" ${VID} "${USER_CONFIG_FILE}"
 writeConfigKey "pid" ${PID} "${USER_CONFIG_FILE}"
 
-# Shows title
-clear
-TITLE="Welcome to Automated Redpill Loader v${ARPL_VERSION}"
-printf "\033[1;44m%*s\n" $COLUMNS ""
-printf "\033[1;44m%*s\033[A\n" $COLUMNS ""
-printf "\033[1;32m%*s\033[0m\n" $(((${#TITLE}+$COLUMNS)/2)) "${TITLE}"
-printf "\033[1;44m%*s\033[0m\n" $COLUMNS ""
-
 # Inform user
 echo -en "Loader disk: \033[1;32m${LOADER_DISK}\033[0m ("
 if [ "${BUS}" = "usb" ]; then

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
@@ -353,23 +362,23 @@ function cmdlineMenu() {
         done
         ;;
       c)
-        dialog --backtitle "`backtitle`" --title "User cmdline" \
-          --inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
-          2>${TMP_PATH}/resp
-        [ $? -ne 0 ] && continue
-        MAC1="`sed 's/://g' <"${TMP_PATH}/resp"`"
-        if [ -z "${MAC1}" ]; then
-          unset CMDLINE["mac1"]
-          unset CMDLINE["netif_num"]
-          deleteConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"
-          deleteConfigKey "cmdline.netif_num" "${USER_CONFIG_FILE}"
-        else
-          CMDLINE["mac1"]="${MAC1}"
-          CMDLINE["netif_num"]=1
-          writeConfigKey "cmdline.mac1"      "${MAC1}" "${USER_CONFIG_FILE}"
-          writeConfigKey "cmdline.netif_num" "1"       "${USER_CONFIG_FILE}"
-        fi
-        /etc/init.d/S30arpl-mac restart 2>&1 | dialog --backtitle "`backtitle`" \
+        while true; do
+          dialog --backtitle "`backtitle`" --title "User cmdline" \
+            --inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
+            2>${TMP_PATH}/resp
+          [ $? -ne 0 ] && continue
+          MAC="`<"${TMP_PATH}/resp"`"
+          [ -z "${MAC}" ] && MAC="`readConfigKey "original-mac" "${USER_CONFIG_FILE}"`"
+          MAC1="`echo "${MAC}" | sed 's/://g'`"
+          [ ${#MAC1} -eq 12 ] && break
+          dialog --backtitle "`backtitle`" --title "User cmdline" --msgbox "Invalid MAC" 0 0
+        done
+        CMDLINE["mac1"]="${MAC1}"
+        CMDLINE["netif_num"]=1
+        writeConfigKey "cmdline.mac1"      "${MAC1}" "${USER_CONFIG_FILE}"
+        writeConfigKey "cmdline.netif_num" "1"       "${USER_CONFIG_FILE}"
+        MAC="${MAC1:0:2}:${MAC1:2:2}:${MAC1:4:2}:${MAC1:6:2}:${MAC1:8:2}:${MAC1:10:2}"
+        ip link set dev eth0 address ${MAC} 2>&1 | dialog --backtitle "`backtitle`" \
           --title "User cmdline" --progressbox "Changing mac" 20 70
         /etc/init.d/S41dhcpcd restart 2>&1 | dialog --backtitle "`backtitle`" \
           --title "User cmdline" --progressbox "Renewing IP" 20 70

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:
@@ -81,4 +82,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"

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"

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"

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"
-

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"

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

@@ -0,0 +1,84 @@
+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"
+beta: true
+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"

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

@@ -0,0 +1,88 @@
+id: "RS4021xs+"
+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_rs4021xs+"
+beta: true
+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"

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,15 +14,17 @@ 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}/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 +33,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."

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"
           }
         ]
       }

rss.xml

@@ -17,6 +17,16 @@
       <ReqBuildPhase>0</ReqBuildPhase>
       <ReqBuildNum>41890</ReqBuildNum>
       <ReqBuildDate>2021/06/25</ReqBuildDate>
+      <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_1520+</mUnique>
         <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat</mLink>
@@ -42,16 +52,6 @@
         <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>
@@ -73,9 +73,9 @@
         <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>
+        <mUnique>synology_broadwellnk_rs4021xs+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_RS4021xs%2B_42661.pat</mLink>
+        <mCheckSum>ddbbbcf8ccb8d9d345df3e08debc66f6</mCheckSum>
       </model>
     </item>
     <item>
@@ -90,6 +90,16 @@
       <ReqBuildPhase>0</ReqBuildPhase>
       <ReqBuildNum>23739</ReqBuildNum>
       <ReqBuildDate>2018/05/19</ReqBuildDate>
+      <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_geminilake_1520+</mUnique>
         <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat</mLink>
@@ -115,16 +125,6 @@
         <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>
@@ -136,9 +136,9 @@
         <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>
+        <mUnique>synology_broadwellnk_rs4021xs+</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat</mLink>
+        <mCheckSum>46d9eb6aba71dbd61ba0394e575b6d58</mCheckSum>
       </model>
     </item>
   </channel>