From 526a1bd3f7b711dad5f46671530429fd7c67cab2 Mon Sep 17 00:00:00 2001 From: Fabio Belavenuto Date: Wed, 10 Aug 2022 10:08:24 -0300 Subject: [PATCH] 0.4-alpha1: new buildnumber 42951 --- VERSION | 2 +- .../arpl/overlayfs/opt/arpl/include/consts.sh | 2 +- .../arpl/model-configs/DS1520+.yml.disabled | 20 ++++++ .../opt/arpl/model-configs/DS1621+.yml | 20 ++++++ .../opt/arpl/model-configs/DS2422+.yml | 20 ++++++ .../opt/arpl/model-configs/DS3615xs.yml | 20 ++++++ .../opt/arpl/model-configs/DS3617xs.yml | 20 ++++++ .../opt/arpl/model-configs/DS3622xs+.yml | 20 ++++++ .../opt/arpl/model-configs/DS918+.yml | 20 ++++++ .../opt/arpl/model-configs/DS920+.yml | 21 ++++++ .../opt/arpl/model-configs/DVA1622.yml | 20 ++++++ .../opt/arpl/model-configs/DVA3221.yml | 20 ++++++ .../ramdisk-42951-post-init-script.patch | 31 ++++++++ new_bn.sh | 71 +++++++++++++++++++ 14 files changed, 305 insertions(+), 2 deletions(-) create mode 100644 files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-42951-post-init-script.patch create mode 100755 new_bn.sh diff --git a/VERSION b/VERSION index 5a4688b8..bbf8584b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3-alpha9 +0.4-alpha1 diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh index 95b1ff6f..c26210af 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh @@ -1,5 +1,5 @@ -ARPL_VERSION="0.3-alpha9" +ARPL_VERSION="0.4-alpha1" # Define paths TMP_PATH="/tmp" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled index 4ddbf8e8..9f230f95 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml.disabled @@ -62,3 +62,23 @@ builds: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1520%2B_42951.pat" + hash: "32063eb34a0e29402c7774d60bb3b7247f894c60e676a437de00cd21b9b68cdb" + ramdisk-hash: "1afd618cd6799087320343a48a3992594730e2e807110f2770a4cf3f708f8ccd" + zimage-hash: "bbfa903358576e5545c3c3c021c292637360f0925de5e59cb3e785f92db71fd3" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml index 1fa161ce..a8185467 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml @@ -65,3 +65,23 @@ builds: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1621%2B_42951.pat" + hash: "127bc3a5405761915f8a4669c925defd39b31b9740064af357ff2db928314ac9" + ramdisk-hash: "12553531c3e8820241babc6b5176ea6f417368e80740c086b6897a67c8783f6e" + zimage-hash: "d28951da0eb41286fbe37ffdfc880271787573d68226e5d26321819cf2d2e6e2" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml index e9d92bb0..3cbbcb12 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml @@ -65,3 +65,23 @@ builds: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS2422%2B_42951.pat" + hash: "ff2e444040f8105079260396649466d791fc8c6613c52ed78d993a784547476d" + ramdisk-hash: "a3a7571bf0220dfe53f750a554c1b570ce4a66792b0dc1c9f2d093f5d7d212b5" + zimage-hash: "d28951da0eb41286fbe37ffdfc880271787573d68226e5d26321819cf2d2e6e2" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml index 8622a9eb..24b5d766 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml @@ -67,3 +67,23 @@ builds: - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" + + 42951: + ver: "7.1.1" + kver: "3.10.108" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3615xs_42951.pat" + hash: "f1de39322babe5664a30e0d16b9ce3d73aeb30742cb7b8def09f40d1577fc5a2" + ramdisk-hash: "0e353b4a8b1f8efa40e6f853a8d16553dfdf1ebc10bcabbe8dfa7803343c26ef" + zimage-hash: "6c535aa513dedc6c2a2b43158e1298c9ea67bf5f909cc19a904e24b51028820b" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml index a7b4735a..350f4859 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml @@ -68,3 +68,23 @@ builds: - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3617xs_42951.pat" + hash: "d879a5be878c59492e4059a833f17d826ed33fb46552b54759e9c37c6ed17a21" + ramdisk-hash: "82148561e561e5a3cb5d88cac47515db6d8426771d8965b1b91b7eab6d1e4a10" + zimage-hash: "7f354665843d73779ba28a1c610c7fb31526b717ce354d459d7e28b2d05257ab" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml index c65f89b7..544d5e2f 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml @@ -70,3 +70,23 @@ builds: - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3622xs%2B_42951.pat" + hash: "11f34ae65b13f7feace40e6a7c2399150ef2b4f4eb3a6dcec0be52fca265f151" + ramdisk-hash: "469d76399eb94fee0cb135c6e178cdea797290671f6bf0ae896d7387f66dc952" + zimage-hash: "9134fc61aea7f687d62728470b8847e640693c444e0afd130882b728ab553fea" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml index 7c882471..d5df65b3 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml @@ -71,3 +71,23 @@ builds: - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS918%2B_42951.pat" + hash: "4035aeea248be9c952298a875050625a2485caf46bcd2f9f1c3b21cc8194304b" + ramdisk-hash: "0eb6433108d8ca1ac1c9b7bf5c35c54c1c0b400f4fcca2c5e95194494fc26686" + zimage-hash: "bb0657c7111a31eaf27e51957ce6f83c6ed48b863666d1ea0a25ed52df3a4020" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml index 94a0668c..87d66c7f 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml @@ -65,3 +65,24 @@ builds: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS920%2B_42951.pat" + hash: "412b94e64fb46bc7732de55bec0892e6ee51529364ae2aa2473d04aa48b9a3bd" + ramdisk-hash: "1026791ed6b9387fc0fcaec68c4606be35d29582ed7501a2fdf02d62c017e368" + zimage-hash: "bbfa903358576e5545c3c3c021c292637360f0925de5e59cb3e785f92db71fd3" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" + diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml index e193f056..95df841a 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml @@ -48,3 +48,23 @@ builds: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA1622_42951.pat" + hash: "2771636333fe1f1f08ad7e80100c0c1224edf1290cea2df848e8d019992b1271" + ramdisk-hash: "920336ce890b099b4192cc41e1773e501392b9611cc09c8f96a4e8ed8ddfdfad" + zimage-hash: "bbfa903358576e5545c3c3c021c292637360f0925de5e59cb3e785f92db71fd3" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml index 3e1b5732..6dbd9535 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml @@ -69,3 +69,23 @@ builds: - "ramdisk-common-init-script.patch" - "ramdisk-42661-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" + + 42951: + ver: "7.1.1" + kver: "4.4.180" + rd-compressed: false + efi-bug: no + cmdline: + <<: *cmdline + synoinfo: + <<: *synoinfo + pat: + url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3221_42951.pat" + hash: "c16020a308e71eab73a5acfce5290d13e1a1a0960fa7887acad3f9b4a71e56eb" + ramdisk-hash: "491f8863b8a1ee36837dcb7e145f793ca840793d3da2c1e67ce8c5f4df096e80" + zimage-hash: "fb4f70d6f67f77b99973113208590363efcdc6c5856c3a5efb85abd75d750260" + patch: + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-42951-post-init-script.patch b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-42951-post-init-script.patch new file mode 100644 index 00000000..e6db176f --- /dev/null +++ b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-42951-post-init-script.patch @@ -0,0 +1,31 @@ +--- a/usr/sbin/init.post ++++ b/usr/sbin/init.post +@@ -31,7 +31,28 @@ + OptPrjQuota="$(GetPQMountOpt "${RootMountPath}")" + # shellcheck disable=SC2046 + Mount "${RootMountPath}" /tmpRoot -o barrier=1,noatime ${OptPrjQuota} ++############################################################################################ ++SED_PATH='/tmpRoot/usr/bin/sed' + ++@@@CONFIG-MANIPULATORS-TOOLS@@@ ++ ++@@@CONFIG-GENERATED@@@ ++ ++UPSTART="/tmpRoot/usr/share/init" ++ ++if ! echo; then ++ _replace_in_file '^start on' '#start on' $UPSTART/tty.conf ++ _replace_in_file "console output" "console none" $UPSTART/syno_poweroff_task.conf ++ _replace_in_file "console output" "console none" $UPSTART/burnin_loader.conf ++ _replace_in_file "console output" "console none" $UPSTART/udevtrigger.conf ++ _replace_in_file "console output" "console none" $UPSTART/bs-poweroff.conf ++ _replace_in_file "console output" "console none" $UPSTART/udevd.conf ++else ++ _replace_in_file '^#start on' 'start on' $UPSTART/tty.conf ++fi ++ ++/addons/addons.sh late ++############################################################################################ + Mkdir -p /tmpRoot/initrd + + Umount /proc >/dev/null 2>&1 diff --git a/new_bn.sh b/new_bn.sh new file mode 100755 index 00000000..b32efbff --- /dev/null +++ b/new_bn.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash + +# Is necessary test the patches + +set -e + +declare -A KVERS +KVERS["DS918+"]="4.4.180" +KVERS["DS920+"]="4.4.180" +KVERS["DS1520+"]="4.4.180" +KVERS["DS1621+"]="4.4.180" +KVERS["DS2422+"]="4.4.180" +KVERS["DS3615xs"]="3.10.108" +KVERS["DS3617xs"]="4.4.180" +KVERS["DS3622xs+"]="4.4.180" +KVERS["DVA1622"]="4.4.180" +KVERS["DVA3221"]="4.4.180" +KVERS["FS2500"]="4.4.180" +KVERS["RS4021xs+"]="4.4.180" +RELEASE="7.1.1" +BUILDNUMBER="42951" + +for MODEL in DS918+ DS920+ DS1520+ DS1621+ DS2422+ DS3615xs DS3617xs DS3622xs+ DVA1622 DVA3221 FS2500 RS4021xs+; do + MODEL_CODED=`echo ${MODEL} | sed 's/+/%2B/g'` + URL="https://global.download.synology.com/download/DSM/release/${RELEASE}/${BUILDNUMBER}/DSM_${MODEL_CODED}_${BUILDNUMBER}.pat" + FILENAME="${MODEL}-${BUILDNUMBER}.pat" + FILEPATH="/tmp/${FILENAME}" + echo -n "Checking ${MODEL}... " + if [ -f ${FILEPATH} ]; then + echo "cached" + else + STATUS=`curl -s -o /dev/null -w "%{http_code}" -L "${URL}"` + if [ ${STATUS} -ne 200 ]; then + echo "error: HTTP status = %{STATUS}" + continue + fi + echo "ok, download it." + curl --progress-bar -C - -L "${URL}" -o ${FILEPATH} + fi + echo "Calculating sha256:" + sudo rm -rf /tmp/extracted + docker run --rm -it -v /tmp:/data syno-extractor /data/${FILENAME} /data/extracted + PAT_CS=`sha256sum ${FILEPATH} | awk '{print$1}'` + ZIMAGE_CS=`sha256sum /tmp/extracted/zImage | awk '{print$1}'` + RD_CS=`sha256sum /tmp/extracted/rd.gz | awk '{print$1}'` + sudo rm -rf /tmp/extracted + cat <