From c3c638b16c45c4c2b02f73511acf47a6bd692546 Mon Sep 17 00:00:00 2001 From: Ing Date: Fri, 12 May 2023 06:07:03 +0800 Subject: [PATCH] localrss addons test --- .../overlayfs/opt/arpl/include/functions.sh | 1 - .../overlayfs/opt/arpl/include/localrss.sh | 81 ------------------- .../overlayfs/opt/arpl/include/modules.sh | 1 - .../arpl/overlayfs/opt/arpl/ramdisk-patch.sh | 10 +-- 4 files changed, 4 insertions(+), 89 deletions(-) delete mode 100644 files/board/arpl/overlayfs/opt/arpl/include/localrss.sh diff --git a/files/board/arpl/overlayfs/opt/arpl/include/functions.sh b/files/board/arpl/overlayfs/opt/arpl/include/functions.sh index dd1951bc..4f806ae7 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/functions.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/functions.sh @@ -1,7 +1,6 @@ . /opt/arpl/include/i18n.sh . /opt/arpl/include/consts.sh . /opt/arpl/include/configFile.sh -. /opt/arpl/include/localrss.sh ############################################################################### # Read key value from model config file diff --git a/files/board/arpl/overlayfs/opt/arpl/include/localrss.sh b/files/board/arpl/overlayfs/opt/arpl/include/localrss.sh deleted file mode 100644 index 83312409..00000000 --- a/files/board/arpl/overlayfs/opt/arpl/include/localrss.sh +++ /dev/null @@ -1,81 +0,0 @@ - -function mkLocalRss() { -RDPATH=${1} -MLINK=${2} -MCHECKSUM=${3} -OUTPATH=${4} - -if [ ! -f ${RDPATH}/etc/VERSION ]; then - return 1 -fi - -. ${RDPATH}/etc/VERSION - -cat > ${OUTPATH}/localrss.json << EOF -{ - "version": "2.0", - "channel": { - "title": "RSS for DSM Auto Update", - "link": "https://update.synology.com/autoupdate/v2/getList", - "pubDate": "Sat Aug 6 0:18:39 CST 2022", - "copyright": "Copyright 2022 Synology Inc", - "item": [ - { - "title": "DSM ${productversion}-${buildnumber}", - "MajorVer": ${major}, - "MinorVer": ${minor}, - "NanoVer": ${micro}, - "BuildPhase": "${buildphase}", - "BuildNum": ${buildnumber}, - "BuildDate": "${builddate}", - "ReqMajorVer": ${major}, - "ReqMinorVer": 0, - "ReqBuildPhase": 0, - "ReqBuildNum": 0, - "ReqBuildDate": "${builddate}", - "isSecurityVersion": false, - "model": [ - { - "mUnique": "${unique}", - "mLink": "${MLINK}", - "mCheckSum": "${MCHECKSUM}" - } - ] - } - ] - } -} -EOF - -cat > ${OUTPATH}/localrss.xml << EOF - - - - RSS for DSM Auto Update - http://update.synology.com/autoupdate/genRSS.php - Tue May 9 11:52:15 CST 2023 - Copyright 2023 Synology Inc - - DSM ${productversion}-${buildnumber} - ${major} - ${minor} - ${buildphase} - ${buildnumber} - ${builddate} - ${major} - 0 - 0 - 0 - ${builddate} - - ${unique} - ${MLINK} - ${MCHECKSUM} - - - - -EOF - -return 0 -} diff --git a/files/board/arpl/overlayfs/opt/arpl/include/modules.sh b/files/board/arpl/overlayfs/opt/arpl/include/modules.sh index 0416f349..cb0b0e5a 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/modules.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/modules.sh @@ -40,7 +40,6 @@ function addToModules() { rm -rf "${MODULES_PATH}/${PLATFORM}-${KVER}.tar" "${TMP_PATH}/modules" } - ############################################################################### # del a ko of modules.tgz # 1 - Platform diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index 18156c0a..6b4820dd 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -139,6 +139,8 @@ echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addon echo "export PLATFORM=${PLATFORM}" >> "${RAMDISK_PATH}/addons/addons.sh" 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 LAYOUT=${LAYOUT}" >> "${RAMDISK_PATH}/addons/addons.sh" echo "export KEYMAP=${KEYMAP}" >> "${RAMDISK_PATH}/addons/addons.sh" chmod +x "${RAMDISK_PATH}/addons/addons.sh" @@ -151,6 +153,8 @@ echo "/addons/disks.sh \${1} ${DT} ${UNIQUE}" >> "${RAMDISK_PATH}/addons/addons. [ -f "${USER_UP_PATH}/${MODEL}.dts" ] && cp "${USER_UP_PATH}/${MODEL}.dts" "${RAMDISK_PATH}/addons/model.dts" installAddon wol echo "/addons/wol.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog +installAddon localrss +echo "/addons/localrss.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog # User addons for ADDON in ${!ADDONS[@]}; do PARAMS=${ADDONS[${ADDON}]} @@ -163,12 +167,6 @@ done [ "2" = "${BUILD:0:1}" ] && sed -i 's/function //g' `find "${RAMDISK_PATH}/addons/" -type f -name "*.sh"` -# loacl rss, Make the bootloader and online installation versions consistent -mkLocalRss "${RAMDISK_PATH}" "${PAT_URL}" "${PAT_MD5_HASH}" "${RAMDISK_PATH}/usr/syno/web" -sed -i "s|rss_server=.*$|rss_server=\"http://localhost:5000/localrss.xml\"|g" "${RAMDISK_PATH}/etc/synoinfo.conf" -sed -i "s|rss_server_ssl=.*$|rss_server_ssl=\"http://localhost:5000/localrss.xml\"|g" "${RAMDISK_PATH}/etc/synoinfo.conf" -sed -i "s|rss_server_v2=.*$|rss_server_v2=\"http://localhost:5000/localrss.json\"|g" "${RAMDISK_PATH}/etc/synoinfo.conf" - # Enable Telnet echo "inetd" >> "${RAMDISK_PATH}/addons/addons.sh"