remove hash check

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

@@ -690,9 +690,7 @@ function synoinfoMenu() {
 # Extract linux and ramdisk files from the DSM .pat
 function extractDsmFiles() {
   PAT_URL="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.url")"
-  PAT_HASH="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.hash")"
+  PAT_MD5="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.md5")"
-  RAMDISK_HASH="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.ramdisk-hash")"
-  ZIMAGE_HASH="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.zimage-hash")"
 
   SPACELEFT=$(df --block-size=1 | awk '/'${LOADER_DEVICE_NAME}'3/{print $4}') # Check disk space left
 
@@ -741,9 +739,9 @@ function extractDsmFiles() {
   fi
 
   echo -n "$(printf "$(TEXT "Checking hash of %s: ")" "${PAT_FILE}")"
-  if [ "$(sha256sum ${PAT_PATH} | awk '{print$1}')" != "${PAT_HASH}" ]; then
+  if [ "$(md5sum ${PAT_PATH} | awk '{print $1}')" != "${PAT_MD5}" ]; then
     dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "Hash of pat not match, try again!")" 0 0
+      --msgbox "$(TEXT "md5 Hash of pat not match, try again!")" 0 0
     rm -f ${PAT_PATH}
     return 1
   fi
@@ -836,28 +834,20 @@ function extractDsmFiles() {
         --textbox "${LOG_FILE}" 0 0
     fi
   fi
-
+  if [ ! -f ${UNTAR_PAT_PATH}/grub_cksum.syno ] ||
-  echo -n "$(TEXT "Checking hash of zImage: ")"
+    [ ! -f ${UNTAR_PAT_PATH}/GRUB_VER ] ||
-  HASH="$(sha256sum ${UNTAR_PAT_PATH}/zImage | awk '{print$1}')"
+    [ ! -f ${UNTAR_PAT_PATH}/zImage ] ||
-  if [ "${HASH}" != "${ZIMAGE_HASH}" ]; then
+    [ ! -f ${UNTAR_PAT_PATH}/rd.gz ]; then
-    sleep 1
     dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "Hash of zImage not match, try again!")" 0 0
+      --msgbox "$(TEXT "pat Invalid, try again!")" 0 0
     return 1
   fi
-  echo "$(TEXT "OK")"
+  echo -n "$(TEXT "Setting hash: ")"
+  ZIMAGE_HASH="$(sha256sum ${UNTAR_PAT_PATH}/zImage | awk '{print $1}')"
   writeConfigKey "zimage-hash" "${ZIMAGE_HASH}" "${USER_CONFIG_FILE}"
-
+  RAMDISK_HASH="$(sha256sum ${UNTAR_PAT_PATH}/rd.gz | awk '{print $1}')"
-  echo -n "$(TEXT "Checking hash of ramdisk: ")"
-  HASH="$(sha256sum ${UNTAR_PAT_PATH}/rd.gz | awk '{print$1}')"
-  if [ "${HASH}" != "${RAMDISK_HASH}" ]; then
-    sleep 1
-    dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "Hash of ramdisk not match, try again!")" 0 0
-    return 1
-  fi
-  echo "$(TEXT "OK")"
   writeConfigKey "ramdisk-hash" "${RAMDISK_HASH}" "${USER_CONFIG_FILE}"
+  echo "$(TEXT "OK")"
 
   echo -n "$(TEXT "Copying files: ")"
   cp "${UNTAR_PAT_PATH}/grub_cksum.syno" "${BOOTLOADER_PATH}"

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

@@ -10,9 +10,6 @@ synoinfo: &synoinfo
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -38,15 +35,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1019%2B_25556.pat"
-      hash: "30bc92943fe2235129f4a897411f433a9f54b208dee7b5deed2d9cd44ffdaabe"
+      md5: "a5291a1d0f31518c09c616502e1433a6"
-      ramdisk-hash: "dcb683c99430354ae49267a1d5f40ee931bb2e64bfc0f5c7e839c67440d4f534"
-      zimage-hash: "e48eacb14f775119a1aba1c36bca33b784d6bb7e8fe0a2d2352070aa5a517bea"
-      md5-hash: "a5291a1d0f31518c09c616502e1433a6"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -59,15 +53,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1019%2B_42218.pat"
-      hash: "e782ad4ce5e0505e7981a5a3fa7ca986a4575240f645ec2c64f92def1774556f"
+      md5: "a7c5ac7a5963aac8bf9a599a8a6f6b86"
-      ramdisk-hash: "a8bcb6c36e8657a8723882b19ec3e76149dc67df3650f6db0af1958637e7f565"
-      zimage-hash: "7311b04f7462847f529cf966c7b332097354692485c8157643d89441e2a81cd0"
-      md5-hash: "a7c5ac7a5963aac8bf9a599a8a6f6b86"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -80,15 +71,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1019%2B_42661.pat"
-      hash: "d0c0154e67af46c4b440e5972a5f405517eecb49e490b7adaf69e8f1ca005776"
+      md5: "1318c234b08c06ad0a6b49a3d739fb95"
-      ramdisk-hash: "c773886310d902432acc4131cd5161820839c787ffba4bfba3495b0e992c4f3a"
-      zimage-hash: "9ce0d3452f08afaf95d52292ff20cbac6d69e17d5b9953377e4ac90c9ac7397d"
-      md5-hash: "1318c234b08c06ad0a6b49a3d739fb95"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -101,15 +89,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1019%2B_42962.pat"
-      hash: "af2268388df9434679205ffd782ae5c17cd81d733cdcd94b13fc894748ffe321"
+      md5: "b590bc9f0df784be4d6bae13d551f76b"
-      ramdisk-hash: "c2ef679f95b892d515148b9095f4808dfe2bc4bf1ed0e5f6049fe773a24a6999"
-      zimage-hash: "f372b5faaca87d852579df25fe1e9471fd346448ead932586ffd069e2dc4fb13"
-      md5-hash: "b590bc9f0df784be4d6bae13d551f76b"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -122,15 +107,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1019%2B_64570.pat"
-      hash: "453aeda2bf814db39588f23802188775a1420b8fc057b0137e21bf60b5126950"
+      md5: "c1c9b295ca7f1434c0f1eeab4f989316"
-      ramdisk-hash: "b85d4cf0dba8400c40fccda18b85d811e4b64b7a32b85f856b7ed62271c8edbc"
-      zimage-hash: "00713e465ddf347e1683a41f7ffa75afd670945c568502d754d4a24c7cb9e4ab"
-      md5-hash: "c1c9b295ca7f1434c0f1eeab4f989316"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   synoboot2:
@@ -36,15 +33,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1520%2B_25556.pat"
-      hash: "6d21f16daea1b0277cd58cfaade118245c5d4edb522aa870164e8a8d0f65948f"
+      md5: "d14c87ddd7c76c4c4156692b4a2c57f7"
-      ramdisk-hash: "cad435ca5e8cea0f7abe3073d021c63c044233c544027dcb432d776a7a2880ec"
-      zimage-hash: "b539a76d93824e16b461fa1820e16f046d4c63fa5390e1508c6830ff7a66caa9"
-      md5-hash: "d14c87ddd7c76c4c4156692b4a2c57f7"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -56,15 +50,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat"
-      hash: "b8864e2becd8ce5a6083db993564c8c0b982df8300a006b56695a0495a670aa3"
+      md5: "d1ebc3c9a2b9e04980a85c4784904f91"
-      ramdisk-hash: "7679ab11e895302425533c64e0dded211b38b8af71f2dd268c47a68bc9f6818a"
-      zimage-hash: "70e93678f3932c35c5e884f950e50b36f8dc6366f96dd9a454c8d47ecbaee5de"
-      md5-hash: "d1ebc3c9a2b9e04980a85c4784904f91"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -76,15 +67,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat"
-      hash: "3a8499c5f72d7241b81781ec741d4019eaa506e6e7a4fd17ce54fb149f6ffae6"
+      md5: "1d8ecfcb2a956488ae355c79a72bb9ec"
-      ramdisk-hash: "b18f14b8420a217d7b6dd3696786ecccfbe7c325d342475531a68a7df831cffc"
-      zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
-      md5-hash: "1d8ecfcb2a956488ae355c79a72bb9ec"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -96,15 +84,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1520%2B_42962.pat"
-      hash: "edcacbab10b77e2a6862d31173f5369c6e3c1720b8f0ec4fd41786609017c39b"
+      md5: "d28994a9dcdae9730b4d1370a39d3130"
-      ramdisk-hash: "93e0b67cce1c91c60dfbaf6cedadab5673dd0432b8e7a8fa5e48c1a8eb1ef64a"
-      zimage-hash: "2de065851b8d3a222db1feea696aab12ded7b582876b22ff6e847cd6f2e62ecf"
-      md5-hash: "d28994a9dcdae9730b4d1370a39d3130"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -116,15 +101,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1520%2B_64570.pat"
-      hash: "e3b62ac87f63017d762cc3e5d93175b13302c4ed3ca4747ec1f7610395980881"
+      md5: "5063db1ed248fb36074ce8d2aba645a9"
-      ramdisk-hash: "13b770f64bdc100929bbc8de6990a2f1ca9578cc336dccefc2a2fe4f580191d6"
-      zimage-hash: "8c7c68a47772ab4ee9c8f2e29f00bbddca6f178e1473f4705569b78effe98417"
-      md5-hash: "5063db1ed248fb36074ce8d2aba645a9"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -7,9 +7,6 @@ synoinfo: &synoinfo
   supportraidgroup:
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   synoboot2:
@@ -37,15 +34,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1621%2B_25556.pat"
-      hash: "d1d0e64d3851bd4e1428fadf4336eb608fa480fc0ed72a0874c99286e9d9528e"
+      md5: "e6be691eb7df063a59f3889ede1b43ce"
-      ramdisk-hash: "2e00a59fde6487433fcca0c4850fbd3481586a0b4e57b16ce1fb39763abf883a"
-      zimage-hash: "467b11a69b4b02e773313826ad16b7c519fa2fcd6b4c59f60e3f7ba82934156f"
-      md5-hash: "e6be691eb7df063a59f3889ede1b43ce"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -57,15 +51,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1621%2B_42218.pat"
-      hash: "396144fdcd94d441b4ad665099395cf24a14606742bee9438745ea30bf12b9ef"
+      md5: "1fd1d6e733bb096f418f68e06f81022e"
-      ramdisk-hash: "127a12bab3835cdf5af4e7ad2a23e78f889408302c55e5052080671cff6da5b7"
-      zimage-hash: "0ab3bf0ff027fb94863ef8822df787194f2d21079ecc66c0b0d4e46d24598855"
-      md5-hash: "1fd1d6e733bb096f418f68e06f81022e"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -77,15 +68,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1621%2B_42661.pat"
-      hash: "381077302a89398a9fb5ec516217578d6f33b0219fe95135e80fd93cddbf88c4"
+      md5: "b4b72eb8d4e84b2e2a8c29fc0a1ac6aa"
-      ramdisk-hash: "8fd5eb40fb088af97d3beee85b6275c2ceb368b08453eb5a5d00d42cc7d578d1"
-      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
-      md5-hash: "b4b72eb8d4e84b2e2a8c29fc0a1ac6aa"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -97,15 +85,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1621%2B_42962.pat"
-      hash: "41a4b80ef58f3ff5ee924329ff59bd4ac0abb7676561847a84e98bc6bb225003"
+      md5: "93a5a2b9515b39e18d0b48df84d5c007"
-      ramdisk-hash: "706956e2aff3dad600ad0bfe87c858b8aa0d1275017bd1c808c4d205182b3f91"
-      zimage-hash: "4f45500024580e03afca1911cf543c48d17cd42944c0c94a8fb686f1384881fe"
-      md5-hash: "93a5a2b9515b39e18d0b48df84d5c007"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -117,15 +102,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1621%2B_64570.pat"
-      hash: "2cb71fb6da7aece7be00a1fbb31b165e38c8ec238fc31e85504073a831c9febb"
+      md5: "6f9fa1ff5b9b2dded366b1a2d2687aea"
-      ramdisk-hash: "095cb1fd974192e4b963b41f24fa1fa88303f4ea0082f225ec75e87231d03a5d"
-      zimage-hash: "87d787143aadd08083956b171c0a7c6b67765635b5b609c1fe87ddf4ae7badd2"
-      md5-hash: "6f9fa1ff5b9b2dded366b1a2d2687aea"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -10,9 +10,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -36,15 +33,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1621xs%2B_25556.pat"
-      hash: "4d8710c74cc71d8cb61a599cc4d20db0086926b41632019fed5d60a65a10c70b"
+      md5: "980277a06f6ba645e8ae64121788beb7"
-      ramdisk-hash: "4136d2fbfdbaab95a4535ec03c62fc26ff142d1487d63e3c3f62fce9cc68751f"
-      zimage-hash: "7eb286f0a1f130761b27e7a173715e3520020b2e4e32b5204aa29f902d617d56"
-      md5-hash: "980277a06f6ba645e8ae64121788beb7"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -57,15 +51,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1621xs%2B_42218.pat"
-      hash: "12bcfd44b4aaa6c3439b1404b7f07760373d816724ef672884d5187f27ccd70f"
+      md5: "302fdefb00c8d4f8bf95ac25dca1e864"
-      ramdisk-hash: "5727d99522a8d7e8e31cdc353e295ce4280b956391396d080d02fcde1e07c029"
-      zimage-hash: "3697732b2f29a4b7020f4994ff06c2d06309894ab568e264716bf7d5d02ae685"
-      md5-hash: "302fdefb00c8d4f8bf95ac25dca1e864"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -78,15 +69,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1621xs%2B_42661.pat"
-      hash: "9dba7c728dbeb69f881a515b841ec82b091fda6741fdbf225d94f1af5bb2a2d6"
+      md5: "18f849121a9a1918aca94c6774524910"
-      ramdisk-hash: "af790b1b52365e9268d0d6126d04ba253eb659029a8860728918818f1aec73ba"
-      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
-      md5-hash: "18f849121a9a1918aca94c6774524910"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -99,15 +87,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1621xs%2B_42962.pat"
-      hash: "d2272ab531f0f68f8008106dd75b4e303c71db8d95093d186a22c1cf2d970402"
+      md5: "fffec3510c954fc718a1aecba2f98fc6"
-      ramdisk-hash: "3f3008d60ab7e3ff9b4d05e7ceeac669ff2365edacc5e6a62e5ccc0e4b617ec3"
-      zimage-hash: "89155c534c5088fd28104c2f10543bf167d4e79a1f756b7f932e4a04a3bfaadb"
-      md5-hash: "fffec3510c954fc718a1aecba2f98fc6"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -120,15 +105,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1621xs%2B_64570.pat"
-      hash: "611bf57e91be99bcc3d494c482b2b25212c998e3588d424c726f011f21c6efb2"
+      md5: "ff027f65c9712059a5a54bfbfb5a52b7"
-      ramdisk-hash: "74d76e32cc5f7b836d2ebc345a2538f7ba62d2842e7a2a53c956de8990678646"
-      zimage-hash: "a4af69c2097b18a5a370768431cf5d84067eaf41833c45088834ae527e5d5da5"
-      md5-hash: "ff027f65c9712059a5a54bfbfb5a52b7"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   supportraidgroup:
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   synoboot2:
   syno_hdd_detect: 0
@@ -36,15 +33,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS1823xs%2B_42962.pat"
-      hash: "4fc66cb6a7377c61d529900a452e815c27755b741ad850948eb68b5103912976"
+      md5: "1011932a1cfb8aa07e77beebede87a71"
-      ramdisk-hash: "18b6ad05d7425867d71330cdc521eeaa7e6ecb6a0a1decb38ca1bf3e271cab6b"
-      zimage-hash: "eea62e136bad70fe1086318d5b3afa809bd24a6e7b1d15a32c0356f862917bb8"
-      md5-hash: "1011932a1cfb8aa07e77beebede87a71"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -56,15 +50,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1823xs%2B_64570.pat"
-      hash: "aa9485370d93bd8d972ab4736b75da2ce1cfad3fcfc409ad36d5a799ed62d50c"
+      md5: "1a8a5e1d8461e9a3af638dae7f121ad3"
-      ramdisk-hash: "76eb37c99186d1d22bdbe18e059959460fa571e5b85f348c3c392c6e3a9d089c"
-      zimage-hash: "87d787143aadd08083956b171c0a7c6b67765635b5b609c1fe87ddf4ae7badd2"
-      md5-hash: "1a8a5e1d8461e9a3af638dae7f121ad3"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   supportraidgroup:
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   synoboot2:
   syno_hdd_detect: 0
@@ -37,15 +34,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS2422%2B_42218.pat"
-      hash: "5a6cfbc690facdfaef9fbcc55215eac38c73ca6a85965a910af11cede5e2cd5d"
+      md5: "7fe3c9ae80396a2ea9ed9909b8746c4b"
-      ramdisk-hash: "57bcadf9699252aa68dac40b5c48f362169b51fda9f77a7f1b51e3336a551f8f"
-      zimage-hash: "e083a8aec10537582ed0dd6d79bc358d9aff828b3e256996ef1e4f4bf418dd5d"
-      md5-hash: "7fe3c9ae80396a2ea9ed9909b8746c4b"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -57,15 +51,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat"
-      hash: "c38fee0470c592b679ab52a64eac76b2a3912fb2e6aba65a65abb5aa05a98d4c"
+      md5: "9ea5e0fe94c01072da36e2f69172abb3"
-      ramdisk-hash: "bb109132e96b1e26d5e3d44557944f7518168d8cb18e35d6254c0dfe7fb19382"
-      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
-      md5-hash: "9ea5e0fe94c01072da36e2f69172abb3"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -77,15 +68,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS2422%2B_42962.pat"
-      hash: "69f02c4636ff2593e5feb393e13ed82791fa6457d61874368a0b6f93ee11f164"
+      md5: "b00d3d1ccf1b1a6982b2b594420e0f3c"
-      ramdisk-hash: "df84a8fb2c2ed875d1710e814ee771237048b89fcc410761e8207a85d4f63ec3"
-      zimage-hash: "4f45500024580e03afca1911cf543c48d17cd42944c0c94a8fb686f1384881fe"
-      md5-hash: "b00d3d1ccf1b1a6982b2b594420e0f3c"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -97,15 +85,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS2422%2B_64570.pat"
-      hash: "e2f88804988da7b9c9f180ec19984d4bfc1031a4ac3d7be1968561601938e0e9"
+      md5: "3e5e09f4d4b0f09ab03f28d12b76f03a"
-      ramdisk-hash: "212a62b3833c4cb16deb3a50b5ab1557f3bdce196bbb9e5418e4956a6edf470a"
-      zimage-hash: "87d787143aadd08083956b171c0a7c6b67765635b5b609c1fe87ddf4ae7badd2"
-      md5-hash: "3e5e09f4d4b0f09ab03f28d12b76f03a"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -10,8 +10,6 @@ synoinfo: &synoinfo
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
   usbportcfg: "0x8700"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -38,15 +36,12 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS3615xs_25556.pat"
-      hash: "86aed87e6cd44a408db57e0cb1bf16fa66e353493fee1878373b5a71f52066d8"
+      md5: "c166cbd39de4d4908e9ce36b93c19274"
-      ramdisk-hash: "06b2452ac733956533c9dd1f5c32bff10261dd28c6ae6fec1578fdbae193b773"
-      zimage-hash: "4b463c7db1d55daa0a1600662ff91fe216a5f0381a41af96c4f7b4ec6f9d548e"
-      md5-hash: "c166cbd39de4d4908e9ce36b93c19274"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -59,15 +54,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3615xs_42218.pat"
-      hash: "ae1aca3b178a00689b93e97cca680b56af3f453174b852e0047496120dee2ee3"
+      md5: "9f959ec4d16d5d7729374961fc2b9bed"
-      ramdisk-hash: "3a8c2fe60142d3eb3a7ed2381819faa1db2cda30ff163288dd0a6c85a25815c1"
-      zimage-hash: "354f0bb13c898a7b24f2942d8015f591f7acce1739e2060580c0f38c41addaf7"
-      md5-hash: "9f959ec4d16d5d7729374961fc2b9bed"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -80,15 +72,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3615xs_42661.pat"
-      hash: "1e95d8c63981bcf42ea2eaedfbc7acc4248ff16d129344453b7479953f9ad145"
+      md5: "271b34cb2a0c23d63178aef3bf45a6ae"
-      ramdisk-hash: "8ee5df65bcfd25c3d1999262153dcff625714d98789bc8065e217773f8d070d8"
-      zimage-hash: "3017542c92232cb5477b0e11d82d708a9909320350b1740aab58359e85f82351"
-      md5-hash: "271b34cb2a0c23d63178aef3bf45a6ae"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -101,15 +90,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3615xs_42962.pat"
-      hash: "f01a17d73e2594b0b31f134bfe023dccc0bb9389a462f9918080573134093023"
+      md5: "cb864a71a791f9a25939356053d25b30"
-      ramdisk-hash: "7e0001a66de6d21484cc3c4326021603c9b2f2a38a14799d7f8575af91c2d2a1"
-      zimage-hash: "3c8d6692eec9f8dcbf3224e73f3442244d53112f5522c3dfb2af280714a7a84c"
-      md5-hash: "cb864a71a791f9a25939356053d25b30"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"

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

@@ -10,8 +10,6 @@ synoinfo: &synoinfo
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
   usbportcfg: "0x8700"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -38,15 +36,12 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS3617xs_25556.pat"
-      hash: "e7b6d125a238f321b08b2c324d0f584f86479441aac9a9be5b8c17973bbae345"
+      md5: "0cc513483fb3c82815ca7dd50fa52e4f"
-      ramdisk-hash: "5d068222465cb1948c1de171628d3a07380882f28209520514dfde95ffc09dee"
-      zimage-hash: "8aa82e525635cd1e6898d7115408ddc595549ef847f203c0c9c0a48697211723"
-      md5-hash: "0cc513483fb3c82815ca7dd50fa52e4f"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -59,15 +54,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3617xs_42218.pat"
-      hash: "f7e846e2a22b62613ac5e9d6e154df0213ba4ae64a6556297af627cd1e643e5c"
+      md5: "b7d85926561ff125928b68e7fffa646b"
-      ramdisk-hash: "eaddd97c40a35bbcf4092417364ca4376925fb3eb322cad0cf602d4c7973d147"
-      zimage-hash: "8e0ab965c85b348dfc9dc17392b9cf0a117756f1d1bc4c0f0d19bb610350659d"
-      md5-hash: "b7d85926561ff125928b68e7fffa646b"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -80,15 +72,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3617xs_42661.pat"
-      hash: "0a5a243109098587569ab4153923f30025419740fb07d0ea856b06917247ab5c"
+      md5: "94e6263912bc758ee3db81c62a94a8f6"
-      ramdisk-hash: "da3c2a170fea24052d817cbc4bb5b610a5b05288758d746b60a294ed614239fb"
-      zimage-hash: "9598f66b75e5b303e571241696e02fe7c0add80f13564f8c6b8c0daaf3cb3018"
-      md5-hash: "94e6263912bc758ee3db81c62a94a8f6"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -101,15 +90,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3617xs_42962.pat"
-      hash: "1b72bb24dc9d10d3784298e6df9d79a8f8c3555087e0de12f3359ce373f4e7c9"
+      md5: "b46e3d7933c7f77c78d536d33f9b5c4a"
-      ramdisk-hash: "2b163be049095a595f024efc06b443e4d2e6fed6cd7b9d8a26c89f03d2ae8ec6"
-      zimage-hash: "109e2ce9c87d2cfc5faf71a27eab11c282eefcd9131371d15598eaecf1aae304"
-      md5-hash: "b46e3d7933c7f77c78d536d33f9b5c4a"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -122,15 +108,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS3617xs_64570.pat"
-      hash: "380103c3642163d3b0e5e603a5d506d1870c70bd89dc8a593ced50407ad18c2b"
+      md5: "4c6165e5c87d83d52a173679d320383f"
-      ramdisk-hash: "0f302e0ad8047e898064b9b3dc7d881c6e177e8294c63f6e58af0457d6b9f4fc"
-      zimage-hash: "4c40ded31fc23dba1db5f05b3928164ea48d736d1d1a9d0bdbb7dffd18068135"
-      md5-hash: "4c6165e5c87d83d52a173679d320383f"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -10,9 +10,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -39,15 +36,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat"
-      hash: "a222d37f369d71042057ccb592f40c7c81e9b988a95d69fa166c7c2a611da99c"
+      md5: "b9b452577b38adc82aca42e031be267b"
-      ramdisk-hash: "11ebadba5d831ad6f31258ab317ed1f7cbfe18243413f9f81291b894b5f7a591"
-      zimage-hash: "d6059bcd7160ed1f775a9323599ac8860b60ada32f0a4f3e5ca166c15a17784e"
-      md5-hash: "b9b452577b38adc82aca42e031be267b"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -60,15 +54,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3622xs%2B_42661.pat"
-      hash: "53d0a4f1667288b6e890c4fdc48422557ff26ea8a2caede0955c5f45b560cccd"
+      md5: "7af76cca8226ecf95b25630bffa76b3d"
-      ramdisk-hash: "df8a055d6bc901229f0ba53ed5b4fe024bdf9a1b42f0c32483adefcdac14db4d"
-      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
-      md5-hash: "7af76cca8226ecf95b25630bffa76b3d"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -81,15 +72,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3622xs%2B_42962.pat"
-      hash: "775933e32a9e04700fc10a155f5a26c0878c3cdec18b6ec6b1d5a4110e83d428"
+      md5: "d3b223e1e973fcf5c67c64e72775a576"
-      ramdisk-hash: "08b50768eacb7810ef87cc875de1d4ecf158aa75f3891359649ad247e8f23cc6"
-      zimage-hash: "89155c534c5088fd28104c2f10543bf167d4e79a1f756b7f932e4a04a3bfaadb"
-      md5-hash: "d3b223e1e973fcf5c67c64e72775a576"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -102,15 +90,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS3622xs%2B_64570.pat"
-      hash: "8c6bc56862017881d46b02b164d8ea0094922e5c44c937ecc8504c3c009e8dd4"
+      md5: "456fc142cf8d3f1c329601c9d9ed66f5"
-      ramdisk-hash: "a0c580a2a5af1bb5a6cc475f4dc06bd2c8ae94a45e5c1badc2dc62cff3f75f34"
-      zimage-hash: "a4af69c2097b18a5a370768431cf5d84067eaf41833c45088834ae527e5d5da5"
-      md5-hash: "456fc142cf8d3f1c329601c9d9ed66f5"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   synoboot2:
@@ -39,15 +36,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS720%2B_25556.pat"
-      hash: "c733cf1a667a6e66557517b56167131fdebb90f3970bcb3f4c6c80651745ed0c"
+      md5: "ae36c9277e076f5b6989532deac5feb0"
-      ramdisk-hash: "2faff9aa079576a1a84f758a069e720b9845d098b0ac068c1e4b038d4e854293"
-      zimage-hash: "b539a76d93824e16b461fa1820e16f046d4c63fa5390e1508c6830ff7a66caa9"
-      md5-hash: "ae36c9277e076f5b6989532deac5feb0"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -59,15 +53,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS720%2B_42218.pat"
-      hash: "3fedba49296a019866cfa18242e633f8419af28522a6bb0e34657143399b54e0"
+      md5: "83dd377fa9d66f21e2ab2536bb9a3943"
-      ramdisk-hash: "ce7c94e65a57456c350e80bfdba5652756150830e1339a1f35af04b9470a4102"
-      zimage-hash: "70e93678f3932c35c5e884f950e50b36f8dc6366f96dd9a454c8d47ecbaee5de"
-      md5-hash: "83dd377fa9d66f21e2ab2536bb9a3943"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -79,15 +70,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS720%2B_42661.pat"
-      hash: "780fcf061dd5845744c9c02d27c8b9378cb7aa327f1bcd83511f2c3d511085ab"
+      md5: "c811400d228502f37370b527b5624967"
-      ramdisk-hash: "141fd7d92e4d12605e9bf28e7a82cd010255f638aa669095b42f5d53f5779054"
-      zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
-      md5-hash: "c811400d228502f37370b527b5624967"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -99,15 +87,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS720%2B_42962.pat"
-      hash: "914641e4885d0a465a46c35e3c271ca5e8cf7f1564591110c762c3ab11d0f202"
+      md5: "9ecc37490cb6e4de3af666db5766cb21"
-      ramdisk-hash: "16a7dc468ff45fa7ee52a48684484ba5b8f1b3607fa3e922b226cc162c33c74d"
-      zimage-hash: "2de065851b8d3a222db1feea696aab12ded7b582876b22ff6e847cd6f2e62ecf"
-      md5-hash: "9ecc37490cb6e4de3af666db5766cb21"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -119,15 +104,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS720%2B_64570.pat"
-      hash: "c1d03806c288b3986d55d8b4c770e29541f7e5047e9ba6f24f25c77733c0921a"
+      md5: "6ff89c899fa9ef0e546a45bc8a5d1b50"
-      ramdisk-hash: "4abf907cacf29efabaaa971d5884c8ec55008414da913a9662850cc3cd56fcd4"
-      zimage-hash: "8c7c68a47772ab4ee9c8f2e29f00bbddca6f178e1473f4705569b78effe98417"
-      md5-hash: "6ff89c899fa9ef0e546a45bc8a5d1b50"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   synoboot2:
   SMBusHddDynamicPower: 1
@@ -35,15 +32,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS723%2B_42962.pat"
-      hash: "93b849708801d6efdf3e6ab9ca01e8e22dd8abd2e21bd90a0532e231cfa86d12"
+      md5: "e8e6598014205a9cfb98c95183e856fe"
-      ramdisk-hash: "ae7fcd5cea940ebe44ec0d581bc1f636f7fa9182717596c251acefaa6528addb"
-      zimage-hash: "351bbabd320ea2966594638aa81c5bf4ae66c520639c25151af2c3bccee9c921"
-      md5-hash: "e8e6598014205a9cfb98c95183e856fe"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -55,15 +49,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS723%2B_64570.pat"
-      hash: "79604df6c2084853b26631a46c781f77c3f3cadfc4f1a793af1c45328a7648a4"
+      md5: "302f4427cc76bc3830afc5cff1424298"
-      ramdisk-hash: "22bf28738e731cd658ccae3b16af51e8c0c31d6b1b1b02142d95e6596e76c979"
-      zimage-hash: "3bc6186d70d954b32ed9a01d7020591dd6e46c6147a7401583d16e26fea3c89d"
-      md5-hash: "302f4427cc76bc3830afc5cff1424298"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,8 +8,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -36,15 +34,12 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS916%2B_25556.pat"
-      hash: "a8b379ec0725e5224c2e6eef409d3deadf846c382822d1c91ea69af8d2a94167"
+      md5: "03b17f09626d77a3f99078380c930597"
-      ramdisk-hash: "73f3d2ac1c7c4f0a9b51eef28edd0dbf35c3cadffff26e9fb595dc716ff6946b"
-      zimage-hash: "0737024331bc12c0c2fe9c19792cd403e3eb555f02fe5b82844bf24b4a9421a3"
-      md5-hash: "03b17f09626d77a3f99078380c930597"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-25556-init-script.patch"
@@ -57,15 +52,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS916%2B_42218.pat"
-      hash: "dd8682c7b13ff07d80823d0e9d7c601edcc161a2c1275de68a7976013e8fbb51"
+      md5: "ed7c45bef0e8a19ae4d1451745d87959"
-      ramdisk-hash: "f97b2fd87da414e527bcc999a5a093c42c1d36cd4f50e0351a5a58135ac676bf"
-      zimage-hash: "7129cd681f2f9ed6cca4726d032352be52ff1f379462fc3210173736921cb5ac"
-      md5-hash: "ed7c45bef0e8a19ae4d1451745d87959"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -78,15 +70,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS916%2B_42661.pat"
-      hash: "ed275b75fce8354d9e0075c0118fd7cd884fae09b8552d56e18d16cb941906d4"
+      md5: "d1f7e79208d48731af49b2ca6e117542"
-      ramdisk-hash: "c47b3b3c5a661d20734e34cd5af58f9cdd0b216ab4c95b254d2a480c594a1b7b"
-      zimage-hash: "d159356f211e8b104a01aae46d174dea5e9634a91dc5ce32671482ca60cd40f8"
-      md5-hash: "d1f7e79208d48731af49b2ca6e117542"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -99,15 +88,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS916%2B_42962.pat"
-      hash: "44000b47a921eeda5a5b3f542e97c849eae4e2db85e34a897178bc9376dc93f0"
+      md5: "19bf342e86c825e1a676c5a7a86b353d"
-      ramdisk-hash: "e340b53a919633ad39105649e67a9bbe54e4ca7f5b1dc3a6f710bc86482d2da7"
-      zimage-hash: "fc9368d9d70f9e4985937fb977c3a903598cf83324f8234407c1ab106c96bcce"
-      md5-hash: "19bf342e86c825e1a676c5a7a86b353d"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -120,15 +106,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS916%2B_64570.pat"
-      hash: "9fff9b8f875098e7bb351e90f998888d079ec2e502b9f413c7e935669b228bc4"
+      md5: "32aa3791b7b4bbdf4b0fe8849e59202d"
-      ramdisk-hash: "ed14613a284f09bfc98b6d82cecd6100a1da89091e1373199125db092482fb55"
-      zimage-hash: "0b46169d9f640fc933024e9e1fe7ed4d380dc3ce0438e4a2551030d782979949"
-      md5-hash: "32aa3791b7b4bbdf4b0fe8849e59202d"
     patch:
       - "ramdisk-64216-disable-root-pwd.patch"
       - "ramdisk-64216-init-script.patch"

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

@@ -10,9 +10,6 @@ synoinfo: &synoinfo
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -41,15 +38,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS918%2B_25556.pat"
-      hash: "24336ef3aa4ab2c484602c6fe9b3b05edf68b7915df8db07b96a7bf21eff5fda"
+      md5: "e44e9590f23a1a6b593d40db182269c5"
-      ramdisk-hash: "66f8ccbc99e430b205c998a076ce7cbcfa2fbe4dd024cf4355a510b8d75783a0"
-      zimage-hash: "e48eacb14f775119a1aba1c36bca33b784d6bb7e8fe0a2d2352070aa5a517bea"
-      md5-hash: "e44e9590f23a1a6b593d40db182269c5"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -62,15 +56,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS918%2B_42218.pat"
-      hash: "a662d11999c266dfa86c54f7ba01045c6644c191124195a22d056d618790dffe"
+      md5: "0c8a0d2dc6f1d7e37ee63d74760808b8"
-      ramdisk-hash: "d27320b536da0ac82d7959e0492180b3a25ef78a3997f65cc4ccddc426b921bd"
-      zimage-hash: "7311b04f7462847f529cf966c7b332097354692485c8157643d89441e2a81cd0"
-      md5-hash: "0c8a0d2dc6f1d7e37ee63d74760808b8"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -83,15 +74,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS918%2B_42661.pat"
-      hash: "4e8a9d82a8a1fde5af9a934391080b7bf6b91811d9583acb73b90fb6577e22d7"
+      md5: "2c49260d2646a0944b56933f7d4029fb"
-      ramdisk-hash: "ef8c87b6e68226339e5623d048252f5be3089c0831e41298a4695f2bfa65f00e"
-      zimage-hash: "9ce0d3452f08afaf95d52292ff20cbac6d69e17d5b9953377e4ac90c9ac7397d"
-      md5-hash: "2c49260d2646a0944b56933f7d4029fb"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -104,15 +92,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS918%2B_42962.pat"
-      hash: "9905e145f3bd88fcc938b00882be10281861867e5165ae98aefa37be0d5d34b5"
+      md5: "d5b62813ebc2d78bdbdf08b2c42e1280"
-      ramdisk-hash: "01fa835229772cdf48be7aa473c029f5d12eefa77d3c6dba7c4f749157b9046b"
-      zimage-hash: "f372b5faaca87d852579df25fe1e9471fd346448ead932586ffd069e2dc4fb13"
-      md5-hash: "d5b62813ebc2d78bdbdf08b2c42e1280"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -125,15 +110,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS918%2B_64570.pat"
-      hash: "379d2f93f6e09f8f53d5ba250d71e9286dc1c0e557dbc9a7b18dce49c34cea13"
+      md5: "4fab55b87cb153239536cca3947f4513"
-      ramdisk-hash: "e6e1a1fd59ce864dd174b6fb733ceda511648a9e3727845b8c0c52995af91fa2"
-      zimage-hash: "00713e465ddf347e1683a41f7ffa75afd670945c568502d754d4a24c7cb9e4ab"
-      md5-hash: "4fab55b87cb153239536cca3947f4513"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -9,9 +9,6 @@ synoinfo: &synoinfo
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   synoboot2:
@@ -40,15 +37,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS920%2B_25556.pat"
-      hash: "fce997f3afe6f5e40b24fdbae574a2e292689822f32f4efd76305c06628a217f"
+      md5: "6b20f985a5a7fc4c40cab223a96c173b"
-      ramdisk-hash: "cdf7b7f61c4ecfdc473936286c4fddf0dd96e373e6deaefa01e073a206140839"
-      zimage-hash: "b539a76d93824e16b461fa1820e16f046d4c63fa5390e1508c6830ff7a66caa9"
-      md5-hash: "6b20f985a5a7fc4c40cab223a96c173b"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -60,15 +54,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS920%2B_42218.pat"
-      hash: "b9b77846e0983f50496276bec6bcdfcfadd4c1f9f0db8ed2ca5766f131ddf97f"
+      md5: "55a7e4ccbf6fcba9238a11976a4a7381"
-      ramdisk-hash: "8607c34fff3a13c75dbc1a9c730de2b2cf649697d6244fd37047090d2e2ba897"
-      zimage-hash: "70e93678f3932c35c5e884f950e50b36f8dc6366f96dd9a454c8d47ecbaee5de"
-      md5-hash: "55a7e4ccbf6fcba9238a11976a4a7381"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -80,15 +71,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS920%2B_42661.pat"
-      hash: "8076950fdad2ca58ea9b91a12584b9262830fe627794a0c4fc5861f819095261"
+      md5: "fa3936a53299b1a1142e4c614e2b360c"
-      ramdisk-hash: "c8ad44826c87e065a3b05f354a639c0a86cb2fa47b88e11949604d53f3e80048"
-      zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
-      md5-hash: "fa3936a53299b1a1142e4c614e2b360c"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -100,15 +88,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS920%2B_42962.pat"
-      hash: "f58c15d4d83699884c30e4a4b04b1d2e0db19c477923d920327a897a73c741b6"
+      md5: "69792ae34d9b3c6e707d0e3e6b82816f"
-      ramdisk-hash: "043d784fd35ee57eb5279c94a65e66ff2c7c4229728818bc141927a6451e95ee"
-      zimage-hash: "2de065851b8d3a222db1feea696aab12ded7b582876b22ff6e847cd6f2e62ecf"
-      md5-hash: "69792ae34d9b3c6e707d0e3e6b82816f"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -120,15 +105,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS920%2B_64570.pat"
-      hash: "fd9305b5a34e5aba79e77496ed5a68ec6823a98840be02f36c01fd273031a8f1"
+      md5: "753b33e8c92bbf331be8e58dd97c242f"
-      ramdisk-hash: "854943f9de0079014904cceb6275d5ec1522419aeb3852e72bf79f97ceadf1ca"
-      zimage-hash: "8c7c68a47772ab4ee9c8f2e29f00bbddca6f178e1473f4705569b78effe98417"
-      md5-hash: "753b33e8c92bbf331be8e58dd97c242f"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   synoboot2:
   SMBusHddDynamicPower: 1
@@ -35,15 +32,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS923%2B_42962.pat"
-      hash: "17e2ef183233175cea392eff69158780d8c3521d1710d504533524351175cba0"
+      md5: "fd4d36adb0645f7c1215854405da62c3"
-      ramdisk-hash: "c934e84d43f0ae7d970ae3b52229f601673c2b3814952c7b85dd809cd957647b"
-      zimage-hash: "351bbabd320ea2966594638aa81c5bf4ae66c520639c25151af2c3bccee9c921"
-      md5-hash: "fd4d36adb0645f7c1215854405da62c3"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -55,15 +49,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS923%2B_64570.pat"
-      hash: "7c6dcdc4d0e88585d20d066ed960839b9c08a548e4d439334e051ec3931d2f31"
+      md5: "8504b920d4af57a5daa3d573cac34870"
-      ramdisk-hash: "d85428564dbe68e4c50f87c50e89bc3dc71157150fc7a5e4b5b244b8e3233832"
-      zimage-hash: "3bc6186d70d954b32ed9a01d7020591dd6e46c6147a7401583d16e26fea3c89d"
-      md5-hash: "8504b920d4af57a5daa3d573cac34870"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   synoboot2:
@@ -39,15 +36,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA1622_42661.pat"
-      hash: "f1484cf302627072ca393293cd73e61dc9e09d479ef028b216eae7c12f7b7825"
+      md5: "27515a2e7c2f2113ccf8955bf22f3974"
-      ramdisk-hash: "6290945ba61f652aec83725f81f5a47bd5e4cdbeb86241c33825154140e164ec"
-      zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
-      md5-hash: "27515a2e7c2f2113ccf8955bf22f3974"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -59,15 +53,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA1622_42962.pat"
-      hash: "ebebc3f1de22b789b386f1d52fbe0be3fcca23f83e0d34ed9c24e794701b4c3d"
+      md5: "6073f5daa75a0eda84e6a3f3cbae4920"
-      ramdisk-hash: "ef95b0b14363c5c7a8a123e0661ac3ac2f35bbdf9d5c61e0d311cab0120de5aa"
-      zimage-hash: "2de065851b8d3a222db1feea696aab12ded7b582876b22ff6e847cd6f2e62ecf"
-      md5-hash: "6073f5daa75a0eda84e6a3f3cbae4920"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -79,15 +70,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA1622_64570.pat"
-      hash: "f5b32522686315ee54c5142b72fa55d65e50019099c067b928a585ade0c2d409"
+      md5: "5729fdc37d56ba46e556a5b6aa931b42"
-      ramdisk-hash: "351878a15e0efd52b78f144f48902346120700892bd96b0397dfdae784c69e65"
-      zimage-hash: "8c7c68a47772ab4ee9c8f2e29f00bbddca6f178e1473f4705569b78effe98417"
-      md5-hash: "5729fdc37d56ba46e556a5b6aa931b42"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -10,9 +10,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -39,15 +36,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DVA3219_25556.pat"
-      hash: "c119f37bd40ce4a5a48868b3409c2c39b5c7d1ce8f84425c45980fbc05736a9d"
+      md5: "20f034e7fa233d95a0160d7479474906"
-      ramdisk-hash: "16a563072e0002bfee2da769fb7147518b232abf47ee974a8539903ce0451637"
-      zimage-hash: "1df1b45276b55b47b6b90ba6b2eadae826ecdd6aa2888214a2fa2496a3dfa3b9"
-      md5-hash: "20f034e7fa233d95a0160d7479474906"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -60,15 +54,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3219_42218.pat"
-      hash: "b3498a20aeb7c7c36deca0f4393172d4db7b51aa4fb87eaace83fe224d935e3b"
+      md5: "4345e7cff9ba4fe97793c254c87b3ed5"
-      ramdisk-hash: "5b301519fe08200e4cb368b7d23e4ce460d5412428126b9496084ceae3f6d67e"
-      zimage-hash: "8b58e602317286bdd25481c4927a791507589ce0b7c29f1ad394d08b634d41a3"
-      md5-hash: "4345e7cff9ba4fe97793c254c87b3ed5"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -81,15 +72,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3219_42661.pat"
-      hash: "01596eaf7310a56b504fde5743262f721dd0be2836e53d2d74386e14f509bec4"
+      md5: "5c4dea4a45d96e1a6d5bcc041d300079"
-      ramdisk-hash: "a62ef4468db4e6c7eab04bb810c603c65e201aebbcc8994423b0c95dd215e4c5"
-      zimage-hash: "5222b5efaf7af28ff3833fd37f13100c30acba1ee201a15b2ee360e66e75b48e"
-      md5-hash: "5c4dea4a45d96e1a6d5bcc041d300079"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -102,15 +90,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3219_42962.pat"
-      hash: "9f8c6095235df2e2caebadf846f11e4244af6f1aada9a7dd5c2c60543f944aac"
+      md5: "6aa37856c3bf2a390f99420b2e7dffa4"
-      ramdisk-hash: "5ba8591bc0ba75e71a1d36b417e7e5763e9a66e71e5ece554c087b9fb0477cf7"
-      zimage-hash: "75fd897aa033e05cdba9490bcfbad9d2c35a5574331c43f732dbfc68957626b9"
-      md5-hash: "6aa37856c3bf2a390f99420b2e7dffa4"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -123,15 +108,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3219_64570.pat"
-      hash: "1fac55d2b133a165d7bac31f647ffc087d52d3e3c36c76ca7c97e4ed07bb417f"
+      md5: "fe64fb7cbcdb699b086579a4a12029f6"
-      ramdisk-hash: "f5348c1f58aba3ea0bec4efe3692e5a5afa2d31b8cee683f975b873dd0936537"
-      zimage-hash: "672b174545a071699389470ab20f82b6ef3cc145780ec4b9beac9ad635e91ff2"
-      md5-hash: "fe64fb7cbcdb699b086579a4a12029f6"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -10,9 +10,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -41,15 +38,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DVA3221_25556.pat"
-      hash: "16f133ca1db76ec7da1bc71b7d122e2656325b1af4fd1b6b9583cfd29542a25b"
+      md5: "bfe93fcc3a0f4e41eaf7a3a3b865124b"
-      ramdisk-hash: "bc2caefd5c46173c03f9f4dbcefb0d383bd8a06c06f95478e34a33b4ab7bc5b1"
-      zimage-hash: "1df1b45276b55b47b6b90ba6b2eadae826ecdd6aa2888214a2fa2496a3dfa3b9"
-      md5-hash: "bfe93fcc3a0f4e41eaf7a3a3b865124b"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -62,15 +56,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat"
-      hash: "6722c73c51070dde2f542659d7728c497fc846256da2c9cf017177476de0bb09"
+      md5: "e3455afd4644cb882cb2c9bede08c7bf"
-      ramdisk-hash: "86a7450cdc461049c4cefe3fe3a1f9d241ea3c484f72f5667d7cd27f2842c8d6"
-      zimage-hash: "8b58e602317286bdd25481c4927a791507589ce0b7c29f1ad394d08b634d41a3"
-      md5-hash: "e3455afd4644cb882cb2c9bede08c7bf"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -83,15 +74,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3221_42661.pat"
-      hash: "ed3207db40b7bac4d96411378558193b7747ebe88f0fc9c26c59c0b5c688c359"
+      md5: "d433ae251ba95754edde1586851d1e0a"
-      ramdisk-hash: "0ff061f453bc9888b16c59baaf3617bfa6ee42044122eb1dd0eaaa18b3832381"
-      zimage-hash: "5222b5efaf7af28ff3833fd37f13100c30acba1ee201a15b2ee360e66e75b48e"
-      md5-hash: "d433ae251ba95754edde1586851d1e0a"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -104,15 +92,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3221_42962.pat"
-      hash: "7bd2fe270bc665cc859142b7c6462fe8137f047c4fbe2f87ed3d03c30c514766"
+      md5: "23a98723cacf1e1bd248cf8ab07bd788"
-      ramdisk-hash: "33dca3330b8bb62a25f9b9ff17dd1461809394be4c1c792cfca5975f79d8e8ef"
-      zimage-hash: "75fd897aa033e05cdba9490bcfbad9d2c35a5574331c43f732dbfc68957626b9"
-      md5-hash: "23a98723cacf1e1bd248cf8ab07bd788"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -125,15 +110,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3221_64570.pat"
-      hash: "e696a59b2242e330666a35a57e2b33f7cc4c48a539e1471e59ebcc3c1f8ab39a"
+      md5: "2002e02d355c43e266222307e041302a"
-      ramdisk-hash: "eb119166253e9c6f1ba067593f708f8be5e194b1edf09610ddc3b17c0aab66d3"
-      zimage-hash: "672b174545a071699389470ab20f82b6ef3cc145780ec4b9beac9ad635e91ff2"
-      md5-hash: "2002e02d355c43e266222307e041302a"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -7,9 +7,6 @@ synoinfo: &synoinfo
   supportraidgroup:
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   synoboot2:
@@ -35,15 +32,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat"
-      hash: "3fbd5defbc0fef0d152494033f3e817c330525b70e356a9e9acd2b72d9806b59"
+      md5: "9562d49a07f5481208b672ff777f3cbf"
-      ramdisk-hash: "8d66ddfa947b38c0e407d4c5efd7558b1a9392e04fd83fe9f162e1aa546f8da8"
-      zimage-hash: "e083a8aec10537582ed0dd6d79bc358d9aff828b3e256996ef1e4f4bf418dd5d"
-      md5-hash: "9562d49a07f5481208b672ff777f3cbf"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -55,15 +49,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat"
-      hash: "f8343ac070b43fe62d02af6ac9a9c61f8c9852b6b2c79b933629409113e1d3e6"
+      md5: "e071c4984d041309f151de29b9ba82b5"
-      ramdisk-hash: "698e9b1d719d3032a9a2b91ca08078c632b3265590147b2f6c9ca200c826e987"
-      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
-      md5-hash: "e071c4984d041309f151de29b9ba82b5"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -75,15 +66,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS2500_42962.pat"
-      hash: "e74ff783b5ca6fbdec1a0eb950b366b74b27c0288fb72baaf86db8a31d68b985"
+      md5: "169493af5375eb9da89ff324a3fe129a"
-      ramdisk-hash: "974616bf6921f561322e53a8d348da76e404e0cb8d4dde22d6191e324e44ffc2"
-      zimage-hash: "4f45500024580e03afca1911cf543c48d17cd42944c0c94a8fb686f1384881fe"
-      md5-hash: "169493af5375eb9da89ff324a3fe129a"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -95,15 +83,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS2500_64570.pat"
-      hash: "d6756ef388a3a9ec55c692a62b99c96c4ab8373aaab66a1d24631bafebd64e79"
+      md5: "faab7cd3b7456a406f4be1afe9012d5d"
-      ramdisk-hash: "087fc56d29e1a512800d129295946c2cbe67cf9a45f74e31facfa496e02fbde4"
-      zimage-hash: "87d787143aadd08083956b171c0a7c6b67765635b5b609c1fe87ddf4ae7badd2"
-      md5-hash: "faab7cd3b7456a406f4be1afe9012d5d"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   synoboot2:
   SMBusHddDynamicPower: 1
@@ -35,15 +32,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_FS6400_25556.pat"
-      hash: "f0606769d11ec97a8a729285479ab26cecb7b5a4af23724a38780b22a7d2ea9a"
+      md5: "c2d4e93551189532d8bd7bbcf2f55411"
-      ramdisk-hash: "ff66dacf8ee8d543c7e4b79584193b47c6d8a31adc5a2f135fe03e001d57319e"
-      zimage-hash: "e8911e5e0028e18c240160ae70ec944df5f0f16d6d8ac461e5f7bc2a17b58e7c"
-      md5-hash: "c2d4e93551189532d8bd7bbcf2f55411"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-25556-init-script.patch"
@@ -55,15 +49,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS6400_42218.pat"
-      hash: "3437cc14ba919f13e37691d31d960f3f48cd3d734c015001ad2a7679636a5e9d"
+      md5: "e7887381980432a7be5ddf4dec0772ad"
-      ramdisk-hash: "ec1e1ea2022ac4af7dfbf2f72b64219b0c8ef747278a0b5c37d50ac7b07195ed"
-      zimage-hash: "67a5c04ba47cbef148195816412f88248b86a58e021e1c8196e31fbd375d0b50"
-      md5-hash: "e7887381980432a7be5ddf4dec0772ad"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -75,15 +66,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS6400_42661.pat"
-      hash: "94a84725e8b24dfb448429068c046e05084ead3a210f8710979e0992904673e7"
+      md5: "030064272d82777681502745fcfa8c48"
-      ramdisk-hash: "6ceff751e7132dd8cc80ff64ee23b7e3b3986d85d7d9132b4cb4b0d50f223b1f"
-      zimage-hash: "2326a556eec4c48b9887bad7eecab268e43dc0e036bed8ddf6fbba466d713cde"
-      md5-hash: "030064272d82777681502745fcfa8c48"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -95,15 +83,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS6400_42962.pat"
-      hash: "5bf4334781dc21270f2f7bde9e781d4fda53656222240db36187089ff018e7a5"
+      md5: "651be491d10a47ecc534295d84341c03"
-      ramdisk-hash: "7743e4d2c3634616a2dc2ae74b81bacbe9439bea9bebc3309b469a842bd7367f"
-      zimage-hash: "3aaa1c27607f295f1fa8778f3e1a020c3a3db6629ea3b6f821286a8da90f6800"
-      md5-hash: "651be491d10a47ecc534295d84341c03"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -115,15 +100,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS6400_64570.pat"
-      hash: "6abf717d858ea90a26038485ed0dd4846191684f61cfc4d8f3f7825397ea21d9"
+      md5: "2e69250e65f75bd4bb9e8274d865bc70"
-      ramdisk-hash: "be37f8816f54e11a4a9c4c8eadb2f41fba719d7564d0f7329e395fe6501ef64b"
-      zimage-hash: "6cb5b2e563f4351b4e91130eff98c95bd8153ab5b67414e1926d1b917179195b"
-      md5-hash: "2e69250e65f75bd4bb9e8274d865bc70"
     patch:
       - "ramdisk-64216-disable-root-pwd.patch"
       - "ramdisk-64216-init-script.patch"

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

@@ -8,9 +8,6 @@ synoinfo: &synoinfo
   supportraidgroup:
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   synoboot2:
@@ -38,15 +35,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS1221%2B_25556.pat"
-      hash: "ec4ea5761dcb5d3bc1a3f5a18fc03e9a912d17f20918115cd2b96de64213d3f3"
+      md5: "121a66f051ece4cf08ebb492f964a4d5"
-      ramdisk-hash: "d1b97b5fbd9dd6d38a5b67f5e90e967bc924f83353284d8706d58ea96ca7f708"
-      zimage-hash: "467b11a69b4b02e773313826ad16b7c519fa2fcd6b4c59f60e3f7ba82934156f"
-      md5-hash: "121a66f051ece4cf08ebb492f964a4d5"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -58,15 +52,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS1221%2B_42218.pat"
-      hash: "d71daffc317b9447fd28cec2db4c699ecde86ddc99819d68a5914a982692887f"
+      md5: "9ab734898b1f8af906b65ff91bf2b399"
-      ramdisk-hash: "784dcce492a26d9280b4be675fa0a3cea02683b979fb11f5f7eb68dcad15fdb6"
-      zimage-hash: "0ab3bf0ff027fb94863ef8822df787194f2d21079ecc66c0b0d4e46d24598855"
-      md5-hash: "9ab734898b1f8af906b65ff91bf2b399"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -78,15 +69,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS1221%2B_42661.pat"
-      hash: "32a415bbbcaf06162ab9b12c6934642b1701048cd53fda10222fd9988a1603ac"
+      md5: "9fbcbffb36e86b86584b416e45d8d0bd"
-      ramdisk-hash: "cf80820f9fd2bd17c8c72207bbb20dd7536579919e8d91ee9b0fa2e078da307d"
-      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
-      md5-hash: "9fbcbffb36e86b86584b416e45d8d0bd"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -98,15 +86,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS1221%2B_42962.pat"
-      hash: "8a06aea176eb5f227675c1b75acd02875c2e0a2d3f4e227e87dc85b663bdbe33"
+      md5: "441e25883733556af6fb6cbab74090fd"
-      ramdisk-hash: "4cc65dd9056d9e095a36828b30d8477ae3d3c385fc95e6ec9eb5d1a904f699ee"
-      zimage-hash: "4f45500024580e03afca1911cf543c48d17cd42944c0c94a8fb686f1384881fe"
-      md5-hash: "441e25883733556af6fb6cbab74090fd"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -118,15 +103,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS1221%2B_64570.pat"
-      hash: "6c6764e53c2d434743c0f6ce2c0bd518dc2b7d462dce553d98e53018956ad0ba"
+      md5: "d71d82a7b5d978ad14e351817d176578"
-      ramdisk-hash: "e0cd32f58dfa9ecb3f4ef2f34f16beb702c68ac5bf786f56301c77894bdc3565"
-      zimage-hash: "87d787143aadd08083956b171c0a7c6b67765635b5b609c1fe87ddf4ae7badd2"
-      md5-hash: "d71d82a7b5d978ad14e351817d176578"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -9,9 +9,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -35,15 +32,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS1619xs%2B_25556.pat"
-      hash: "5616c10f5ffc0a4afaca958b0875d9c82232a4460155105bf7af25d599d1a233"
+      md5: "0658c032de104ae55950c256b697132d"
-      ramdisk-hash: "d08e0559947c0b4de50bbf7915cd6951103a55207b8bf74370ac6cfcad4a2353"
-      zimage-hash: "7eb286f0a1f130761b27e7a173715e3520020b2e4e32b5204aa29f902d617d56"
-      md5-hash: "0658c032de104ae55950c256b697132d"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -56,15 +50,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS1619xs%2B_42218.pat"
-      hash: "96aebb54e43bff8b06083985471ba5d245d652506254583d007d0b2eb1746520"
+      md5: "1ef98087cb11be286a8eac26f55dbe52"
-      ramdisk-hash: "c4782f236867a16b8293f18cf5687629ac59fdba225bf1090ed97c5f2a199a0e"
-      zimage-hash: "3697732b2f29a4b7020f4994ff06c2d06309894ab568e264716bf7d5d02ae685"
-      md5-hash: "1ef98087cb11be286a8eac26f55dbe52"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -77,15 +68,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS1619xs%2B_42661.pat"
-      hash: "70084213d8da99e53091fecd21fb33041d6ad65d91029f5a0556391f48d585ce"
+      md5: "0c0b793d8ae1f0a1ecba66e280bd81e7"
-      ramdisk-hash: "5cec490e3db5ee1a2576b5c1c809cfc1034bd285fb41bd060b55642cd3a0eec3"
-      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
-      md5-hash: "0c0b793d8ae1f0a1ecba66e280bd81e7"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -98,15 +86,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS1619xs%2B_42962.pat"
-      hash: "4cd9b66fcf56d8d8cedd1435267a18c0b1cb7894462bdaf4db1bd9bb8f1ac0e1"
+      md5: "7e0747b8808941d51c35de503473b62e"
-      ramdisk-hash: "f7da7a63438138e91d2170836c0329c9127755e80bc97ffc618a92de8219e82c"
-      zimage-hash: "89155c534c5088fd28104c2f10543bf167d4e79a1f756b7f932e4a04a3bfaadb"
-      md5-hash: "7e0747b8808941d51c35de503473b62e"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -119,15 +104,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS1619xs%2B_64570.pat"
-      hash: "47076be96e9c779c13c04b96947f979900ba2ddceec3119ca724738aee7bf079"
+      md5: "631c7162e33a11d4555121a188540c83"
-      ramdisk-hash: "b36c718e09daf8ccff439262a7336fcf9ca50af7ea91ca0e224627c118cbc817"
-      zimage-hash: "a4af69c2097b18a5a370768431cf5d84067eaf41833c45088834ae527e5d5da5"
-      md5-hash: "631c7162e33a11d4555121a188540c83"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -9,8 +9,6 @@ synoinfo: &synoinfo
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
   usbportcfg: "0x8700"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -37,15 +35,12 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3413xs%2B_25556.pat"
-      hash: "4d920c2bfc173f9f583b35f10369109793c1effabe03ee56ffb35974d1c674bf"
+      md5: "9651b2cd3fd42e45450a72617fbb2803"
-      ramdisk-hash: "c256ca6f2f353d97d47befd2a7267e3dda677e3307b7bb38a45870365b855a43"
-      zimage-hash: "4b463c7db1d55daa0a1600662ff91fe216a5f0381a41af96c4f7b4ec6f9d548e"
-      md5-hash: "9651b2cd3fd42e45450a72617fbb2803"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -58,15 +53,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3413xs%2B_42218.pat"
-      hash: "b5f5505a4ee0d623c562db43a0be6aba64a5bc57c6d6dcb796d80a60ea5fc7cd"
+      md5: "2f2e7312db70ca36b3c09236f117f23f"
-      ramdisk-hash: "ad2b7c6ffabf348a14df0558ab89bc2ac62226b33dfe5b19114f7beed11ae41f"
-      zimage-hash: "354f0bb13c898a7b24f2942d8015f591f7acce1739e2060580c0f38c41addaf7"
-      md5-hash: "2f2e7312db70ca36b3c09236f117f23f"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -79,15 +71,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3413xs%2B_42661.pat"
-      hash: "16446a2f8c157ecde3714d0dc1c37cf4e9fd8189286a6417d77c65c0ea87c8e5"
+      md5: "f4ffa894e9b7218ea12d601d493fcda2"
-      ramdisk-hash: "1f8d64b17aab7e401b14ec01f96adde070b28d50b8256ff82cc296ebd5b62421"
-      zimage-hash: "3017542c92232cb5477b0e11d82d708a9909320350b1740aab58359e85f82351"
-      md5-hash: "f4ffa894e9b7218ea12d601d493fcda2"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -100,15 +89,12 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS3413xs%2B_42962.pat"
-      hash: "69972c59bd1e3702776f565f40c1c1a226bfa6f914a051b7056ded4352319bf8"
+      md5: "508ed0ce3b827dcff5f6796700098a5c"
-      ramdisk-hash: "dcb00ef6973050aba866fe2d64dc1bcf8b46bc0eda5b2b405ab186e3443d64ed"
-      zimage-hash: "3c8d6692eec9f8dcbf3224e73f3442244d53112f5522c3dfb2af280714a7a84c"
-      md5-hash: "508ed0ce3b827dcff5f6796700098a5c"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"

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

@@ -10,8 +10,6 @@ synoinfo: &synoinfo
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
   usbportcfg: "0x8700"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -38,15 +36,12 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3618xs_25556.pat"
-      hash: "3929f05022ad28d595803758d4198b9e9d9e08878a0c40db9f5512c66e0374de"
+      md5: "d71c24813b6f1032a5f55e6dc206985f"
-      ramdisk-hash: "0f3733f51c4761937304097549aa19bb15d4e58e4bcce28f8b8d5c5922aa58d6"
-      zimage-hash: "8aa82e525635cd1e6898d7115408ddc595549ef847f203c0c9c0a48697211723"
-      md5-hash: "d71c24813b6f1032a5f55e6dc206985f"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -59,15 +54,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3618xs_42218.pat"
-      hash: "941886bee9a0929c6bd078c5f2c465d9599721fc885a1e3835d6b60631f419af"
+      md5: "e91236e37fdbbb3a4f368dffa5a63013"
-      ramdisk-hash: "cd7c7ed0fba15b2d3eae70b9d6f680a8dfbe1138164e6312d98482177746f544"
-      zimage-hash: "41993de949af53def17ca6190bfff503044b9ebc0beccf7a3d54ab050998e9db"
-      md5-hash: "e91236e37fdbbb3a4f368dffa5a63013"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -80,15 +72,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3618xs_42661.pat"
-      hash: "1aaa9b78d0287b2acc3d4f38757b4aef72ce98f20e3a44b71a44dddea1b842ea"
+      md5: "f36f1f22a48b184358823b6168a904fd"
-      ramdisk-hash: "b383ca0fcc18fa29f939e858739a70784e16f683640790b59e84f8734e03975e"
-      zimage-hash: "9598f66b75e5b303e571241696e02fe7c0add80f13564f8c6b8c0daaf3cb3018"
-      md5-hash: "f36f1f22a48b184358823b6168a904fd"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -101,15 +90,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS3618xs_42962.pat"
-      hash: "2ccd7dc0c33cb133476bce8cdd29db6a164669c0e0caf6fb2daad17202525ec5"
+      md5: "dce0cd634df74b45c09379d9f348c16d"
-      ramdisk-hash: "ae4b42902caa5cba3d911f1fd8738d00aa7cf1b1a3160cc3e3edb7a78000abd7"
-      zimage-hash: "f32c96d0b2b78dc2b414afb5528d937e3800e33ba9eb0a584a25cfbf33cb94f0"
-      md5-hash: "dce0cd634df74b45c09379d9f348c16d"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -122,15 +108,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3618xs_64570.pat"
-      hash: "583d29266def40decd043e9495fdae8ebbd920adf25c1b982dfb87518ad7e311"
+      md5: "bcf1a8b41452fd8bf8f35d2e698894ce"
-      ramdisk-hash: "d6a90973f7a50f6390429d774219af0aae821fcdd6d14403ea7048061b52268f"
-      zimage-hash: "4c40ded31fc23dba1db5f05b3928164ea48d736d1d1a9d0bdbb7dffd18068135"
-      md5-hash: "bcf1a8b41452fd8bf8f35d2e698894ce"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -9,9 +9,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -35,15 +32,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3621xs%2B_25556.pat"
-      hash: "1f04de91a8a530c5c346efc86421c75a9fe3569c4c963411604084d48b2a29c3"
+      md5: "e493fbac6a3b0116a8286e42ff0e4559"
-      ramdisk-hash: "b3963285eba1923acf3dbd871bf1c3f127269a8830ebfb1c52c6786c1b16e57c"
-      zimage-hash: "3ed70ae5affbf7e2eb0fb124740e81c6cb20742e73e2540c91e937c1763f2047"
-      md5-hash: "e493fbac6a3b0116a8286e42ff0e4559"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -56,15 +50,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3621xs%2B_42218.pat"
-      hash: "8c1187abe05449778cc11017cbda917a1f74479011c218760e75c4de56e5e996"
+      md5: "f2b6896f7ea7237bd52501f80e502396"
-      ramdisk-hash: "7846ee38f8bea17067e335da893bba4dec2f8572cae8973ebf097879802bd7fa"
-      zimage-hash: "d6059bcd7160ed1f775a9323599ac8860b60ada32f0a4f3e5ca166c15a17784e"
-      md5-hash: "f2b6896f7ea7237bd52501f80e502396"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -77,15 +68,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3621xs%2B_42661.pat"
-      hash: "97747a6a1c901d1df417b66eb7d3c65c77925ee0bcbb261174f447ea5242f08e"
+      md5: "5dd0954d761e8ac81f3e2f50e088fb8e"
-      ramdisk-hash: "b58aec23a00a333bc4a2eb619c551598a3101be887e262771637ef7279b3d727"
-      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
-      md5-hash: "5dd0954d761e8ac81f3e2f50e088fb8e"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -98,15 +86,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS3621xs%2B_42962.pat"
-      hash: "3d82184a9346dc1e3405b743b8a079318e095563d3dc8e8016201df12033db4c"
+      md5: "02d56d400ac1c57593bc2faf9cc16a9b"
-      ramdisk-hash: "2780decd6b3f5337c4ddd3e8404735fdc4c569bed880f2f4a2e2ef50c7bd692f"
-      zimage-hash: "2547ff79d8bce71cfa28e5bad84b8022d4278ef111a7b0730c3d6971ff026b9c"
-      md5-hash: "02d56d400ac1c57593bc2faf9cc16a9b"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -119,15 +104,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3621xs%2B_64570.pat"
-      hash: "7b675342f838e99c58a9c124bcd3d11f4537acf3de714c6c2c07e20ad8b252c8"
+      md5: "b1517fb23721192de7e666da8cd2ae00"
-      ramdisk-hash: "a13321bd9f47448913e0aa8de081663f4ef3af5726da9396c577514bd39c58c7"
-      zimage-hash: "a4af69c2097b18a5a370768431cf5d84067eaf41833c45088834ae527e5d5da5"
-      md5-hash: "b1517fb23721192de7e666da8cd2ae00"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -9,9 +9,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -35,15 +32,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS4021xs%2B_25556.pat"
-      hash: "b79e34a7b8157ca5d1d2fbdbc48780d567f87a8e57252135068b21f1b0d6baf2"
+      md5: "b5f616abfbed3ab61d1fa043ae3d67aa"
-      ramdisk-hash: "004d67e44fdf56fe3600775473d11a7d1efa65d8e1e3e1f9f274c444c9035cde"
-      zimage-hash: "3ed70ae5affbf7e2eb0fb124740e81c6cb20742e73e2540c91e937c1763f2047"
-      md5-hash: "b5f616abfbed3ab61d1fa043ae3d67aa"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -56,15 +50,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat"
-      hash: "2a32266b7bcf0b2582b5afd9e39dc444e7cb40eaf4ccfdbfedf4743af821f11c"
+      md5: "cbcb77548de26b6843ab31d7a7258b62"
-      ramdisk-hash: "f2b99b4c05559376d34d30d6446c30a8b3f44f516e5a041299d03be9c7fd0095"
-      zimage-hash: "d6059bcd7160ed1f775a9323599ac8860b60ada32f0a4f3e5ca166c15a17784e"
-      md5-hash: "cbcb77548de26b6843ab31d7a7258b62"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -77,15 +68,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS4021xs%2B_42661.pat"
-      hash: "496b64e431dafa34cdebb92da8ac736bf1610fe157f03df7e6d11152d60991f5"
+      md5: "ddbbbcf8ccb8d9d345df3e08debc66f6"
-      ramdisk-hash: "143e475fe73c0adb3377361402b4baad21448476e844e55e16d1ed51ffc4c971"
-      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
-      md5-hash: "ddbbbcf8ccb8d9d345df3e08debc66f6"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -98,15 +86,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS4021xs%2B_42962.pat"
-      hash: "9b24656847eac5e94765f314e12f18b1dbec02b8f94c5366cc92211c4fba8c92"
+      md5: "cef9e139ddc27ddcc61f5423bac47659"
-      ramdisk-hash: "8bbdadb82ca305b98f4f161c94aa08e409a59afef0b0bcc5dddd7bf7ab2765a0"
-      zimage-hash: "2547ff79d8bce71cfa28e5bad84b8022d4278ef111a7b0730c3d6971ff026b9c"
-      md5-hash: "cef9e139ddc27ddcc61f5423bac47659"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -119,15 +104,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS4021xs%2B_64570.pat"
-      hash: "3004dff33f4cb3e99e97aa834c5478a708df72cbb6e46859bd5dbc1a93269aca"
+      md5: "a55ff87947b0ad53e981dc1ffd23c829"
-      ramdisk-hash: "1eef565b10afff16783e1cffa79126457f3264244e50b0ed8569129f0fb15434"
-      zimage-hash: "a4af69c2097b18a5a370768431cf5d84067eaf41833c45088834ae527e5d5da5"
-      md5-hash: "a55ff87947b0ad53e981dc1ffd23c829"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -9,9 +9,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   synoboot2:
@@ -37,15 +34,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_SA3400_25556.pat"
-      hash: "93b412342dc9667f5801ba0384f53dbc5625a4f80f8e4018edfe317d1a05a3e8"
+      md5: "c6918f2e859cb84ff7349e93cef51237"
-      ramdisk-hash: "04d18fad3d25e86f8f0d92c0b5455bf9f8897f3b14e1d604965cb548764c0186"
-      zimage-hash: "7eb286f0a1f130761b27e7a173715e3520020b2e4e32b5204aa29f902d617d56"
-      md5-hash: "c6918f2e859cb84ff7349e93cef51237"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-25556-init-script.patch"
@@ -58,15 +52,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_SA3400_42218.pat"
-      hash: "addb6cb2a20c28a381e8c7cc1c924dcd41290393d664d4323a7f4f9facf700b4"
+      md5: "236dbf3601ffec5259a3c9d42bb640ba"
-      ramdisk-hash: "c6bb499d3585f59a8433fa7d3e2e74cfce8788f1a328d2471ab76c49504760c9"
-      zimage-hash: "d6059bcd7160ed1f775a9323599ac8860b60ada32f0a4f3e5ca166c15a17784e"
-      md5-hash: "236dbf3601ffec5259a3c9d42bb640ba"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -79,15 +70,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3400_42661.pat"
-      hash: "d6f0d86dfc6146804176a62c87dab586eb25067f51ed91ee265dd40ea187e995"
+      md5: "ae40bcb16dc2c6977371bd0349dde3c2"
-      ramdisk-hash: "52ee6a2deb4e04565606336915075ed14aeccdaf257cc227eee5841742641f34"
-      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
-      md5-hash: "ae40bcb16dc2c6977371bd0349dde3c2"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -100,15 +88,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3400_42962.pat"
-      hash: "df1e1d2d32113419a5d5a0ba0213a35dc3ac6ad462ebe885ccf86a06c057fe1c"
+      md5: "cc0a219656db7ef26587ed59bbf1643f"
-      ramdisk-hash: "0d056b181721b136bf3417c67e2a5a59ad106d36b8ad01d0026d1d95960724d4"
-      zimage-hash: "89155c534c5088fd28104c2f10543bf167d4e79a1f756b7f932e4a04a3bfaadb"
-      md5-hash: "cc0a219656db7ef26587ed59bbf1643f"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-init-script.patch"
@@ -121,15 +106,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3400_64570.pat"
-      hash: "e6eae15ca7e515fe253ea3c67a120f43d6fe2dea7c698559fe58515381b051e2"
+      md5: "eabb43133e9136a808bc7f4442f01000"
-      ramdisk-hash: "e44af5436482c4fc70bc25f0de2f772d906175878c83d08eef6a05a567bf49cf"
-      zimage-hash: "a4af69c2097b18a5a370768431cf5d84067eaf41833c45088834ae527e5d5da5"
-      md5-hash: "eabb43133e9136a808bc7f4442f01000"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-init-script.patch"

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

@@ -10,9 +10,6 @@ synoinfo: &synoinfo
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   esataportcfg: "0x00"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   HddHotplug: 0
   syno_hdd_detect: 0
@@ -39,15 +36,12 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_SA3600_25556.pat"
-      hash: "46f23b5778461b75f04b7ba0306f7d382681344a7a6944aa0a433c757a573677"
+      md5: "5fcc06efe85c74276736dd49717c33f1"
-      ramdisk-hash: "c7d9ed255e1f97e0d8b095831b03e632d518a9042e7a06a157c95c124f1dc3bc"
-      zimage-hash: "7eb286f0a1f130761b27e7a173715e3520020b2e4e32b5204aa29f902d617d56"
-      md5-hash: "5fcc06efe85c74276736dd49717c33f1"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-25556-init-script.patch"
@@ -60,15 +54,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_SA3600_42218.pat"
-      hash: "1f85af88089fe2d2d6ff6ff334243052b8a219b6cb743d3622ae1ca8cf2d5f97"
+      md5: "64c75bdf8d28761cb294e41bf3aee2e9"
-      ramdisk-hash: "dbeacb77eaeaf3cecb8688bf53406f6acf9251c2f3e0647dca5b5c9bb58df3e2"
-      zimage-hash: "d6059bcd7160ed1f775a9323599ac8860b60ada32f0a4f3e5ca166c15a17784e"
-      md5-hash: "64c75bdf8d28761cb294e41bf3aee2e9"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -81,15 +72,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3600_42661.pat"
-      hash: "1399fb1659603d93a1c143ff9baae09f4e03e392c91fa78457812ab584e3966b"
+      md5: "ece886eba8b0c2eaf260704dbd20f9a7"
-      ramdisk-hash: "c639fa9f0c258a1d03c1002a61e147aa88c158b31751a4f36035e70735d657bd"
-      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
-      md5-hash: "ece886eba8b0c2eaf260704dbd20f9a7"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -102,15 +90,12 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3600_42962.pat"
-      hash: "0c62cc533c2530d3fb6aee01f15f477fec7dfd9851e00ac4782a870c71056d1c"
+      md5: "7c21732ca4f4cb4cf43538a3d9497cf8"
-      ramdisk-hash: "f455f060c364329e596e21da56d0c6d9dc1afe9935fcb7f622ff2917647e77dc"
-      zimage-hash: "89155c534c5088fd28104c2f10543bf167d4e79a1f756b7f932e4a04a3bfaadb"
-      md5-hash: "7c21732ca4f4cb4cf43538a3d9497cf8"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
@@ -123,15 +108,12 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3600_64570.pat"
-      hash: "9cc63f96bf43e349e5a20b6efbd2da281ae962bb8fa827d5ada6437b590ec565"
+      md5: "cc489fe3b383290713dd13f363a1ee7e"
-      ramdisk-hash: "18148d71de2f26f742624d6b0ead2555332996fe60b2d534db6f13a92f988832"
-      zimage-hash: "a4af69c2097b18a5a370768431cf5d84067eaf41833c45088834ae527e5d5da5"
-      md5-hash: "cc489fe3b383290713dd13f363a1ee7e"
     patch:
       - "ramdisk-64216-disable-root-pwd.patch"
       - "ramdisk-64216-init-script.patch"

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

@@ -7,9 +7,6 @@ synoinfo: &synoinfo
   supportraidgroup:
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
-  #rss_server: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_ssl: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.xml"
-  #rss_server_v2: "https://raw.githubusercontent.com/wjz304/arpl-i18n/main/rss.json"
 cmdline: &cmdline
   synoboot2:
   SMBusHddDynamicPower: 1
@@ -33,15 +30,12 @@ builds:
     kver: "5.10.55"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_SA6400_42962.pat"
-      hash: "5c1d59c19b032183e92efd6c82a0573bc6704b22f7c92ed2c19e0e8ca4c777d8"
+      md5: "7bb63d65829b2ad4bcfda3b37e0ac1b1"
-      ramdisk-hash: "8499dfdf5c4e355455b9f802c4277f31b412f8caa8fdd8e5bb28b124e5c4dd84"
-      zimage-hash: "bcbb35ae4b74c0b05f0bea2d1ab5125f911475e4f963b3050d442ad25fbbdd59"
-      md5-hash: "7bb63d65829b2ad4bcfda3b37e0ac1b1"
     patch:
     - "ramdisk-common-disable-root-pwd.patch"
     - "ramdisk-common-sa6400-init-script.patch"
@@ -53,15 +47,12 @@ builds:
     kver: "5.10.55"
     rd-compressed: false
     cmdline:
-      <<: *cmdline
+      !!merge <<: *cmdline
     synoinfo:
-      <<: *synoinfo
+      !!merge <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA6400_64570.pat"
-      hash: "1cdf0a81e889a6d89d795080a9774a15ee1b56ab6c64854739a03113d8143a83"
+      md5: "83b591bfb240c51b2feff8f02eac8bde"
-      ramdisk-hash: "48227142edd6ea969ebec6c3160c9939aef5a853e1ba2556d3401a68c5953357"
-      zimage-hash: "6fd6d57b5b856569b3c48e3a416c0a68fc8bcd45db1ebd09bdb5b79f4dfc3300"
-      md5-hash: "83b591bfb240c51b2feff8f02eac8bde"
     patch:
     - "ramdisk-64216-disable-root-pwd.patch"
     - "ramdisk-64216-sa6400-init-script.patch"

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

@@ -49,7 +49,7 @@ UNIQUE=$(readModelKey "${MODEL}" "unique")
 PLATFORM="$(readModelKey "${MODEL}" "platform")"
 KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")"
 PAT_URL="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.url")"
-PAT_MD5_HASH="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.md5-hash")"
+PAT_MD5="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.md5")"
 RD_COMPRESSED="$(readModelKey "${MODEL}" "builds.${BUILD}.rd-compressed")"
 
 # Sanity check
@@ -139,7 +139,7 @@ echo "export PLATFORM=${PLATFORM}"              >>"${RAMDISK_PATH}/addons/addons
 echo "export MODEL=${MODEL}"                    >>"${RAMDISK_PATH}/addons/addons.sh"
 echo "export BUILD=${BUILD}"                    >>"${RAMDISK_PATH}/addons/addons.sh"
 echo "export MLINK=${PAT_URL}"                  >>"${RAMDISK_PATH}/addons/addons.sh"
-echo "export MCHECKSUM=${PAT_MD5_HASH}"         >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export MCHECKSUM=${PAT_MD5}"              >>"${RAMDISK_PATH}/addons/addons.sh"
 echo "export LAYOUT=${LAYOUT}"                  >>"${RAMDISK_PATH}/addons/addons.sh"
 echo "export KEYMAP=${KEYMAP}"                  >>"${RAMDISK_PATH}/addons/addons.sh"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"