diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c54bc569..967948f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,6 +23,10 @@ on: description: 'format %y.%-m.$i or auto' required: false type: string + prerelease: + description: 'pre release' + default: false + type: boolean jobs: build: @@ -202,6 +206,7 @@ jobs: if: env.VERSION != '' with: tag_name: ${{ env.VERSION }} + prerelease: ${{ inputs.prerelease }} files: | arpl-i18n-${{ env.VERSION }}.img.zip arpl-i18n-${{ env.VERSION }}.vmdk-dyn.zip diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh index 58311149..64342948 100755 --- a/files/board/arpl/overlayfs/opt/arpl/boot.sh +++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh @@ -54,22 +54,23 @@ fi VID="$(readConfigKey "vid" "${USER_CONFIG_FILE}")" PID="$(readConfigKey "pid" "${USER_CONFIG_FILE}")" MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" -BUILD="$(readConfigKey "build" "${USER_CONFIG_FILE}")" +PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" +BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")" +SMALLNUM="$(readConfigKey "smallnum" "${USER_CONFIG_FILE}")" LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")" SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")" -SFNUM="$(readConfigKey "smallfixnumber" "${USER_CONFIG_FILE}")" CPU="$(echo $(cat /proc/cpuinfo | grep 'model name' | uniq | awk -F':' '{print $2}'))" MEM="$(free -m | grep -i mem | awk '{print$2}') MB" echo -e "$(TEXT "Model:") \033[1;36m${MODEL}\033[0m" -echo -e "$(TEXT "Build:") \033[1;36m${BUILD}$([ ${SFNUM:-0} -ne 0 ] && echo "u${SFNUM}")\033[0m" +echo -e "$(TEXT "Build:") \033[1;36m${PRODUCTVER}(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))\033[0m" echo -e "$(TEXT "LKM: ") \033[1;36m${LKM}\033[0m" echo -e "$(TEXT "CPU: ") \033[1;36m${CPU}\033[0m" echo -e "$(TEXT "MEM: ") \033[1;36m${MEM}\033[0m" -if [ ! -f "${MODEL_CONFIG_PATH}/${MODEL}.yml" ] || [ -z "$(readConfigKey "builds.${BUILD}" "${MODEL_CONFIG_PATH}/${MODEL}.yml")" ]; then - echo -e "\033[1;33m*** $(printf "$(TEXT "The current version of arpl does not support booting %s-%s, please rebuild.")" "${MODEL}" "${BUILD}") ***\033[0m" +if [ ! -f "${MODEL_CONFIG_PATH}/${MODEL}.yml" ] || [ -z "$(readConfigKey "productvers.[${PRODUCTVER}]" "${MODEL_CONFIG_PATH}/${MODEL}.yml")" ]; then + echo -e "\033[1;33m*** $(printf "$(TEXT "The current version of arpl does not support booting %s-%s, please rebuild.")" "${MODEL}" "${PRODUCTVER}") ***\033[0m" exit 1 fi @@ -88,13 +89,13 @@ CMDLINE['sn']="${SN}" # Read cmdline while IFS=': ' read KEY VALUE; do [ -n "${KEY}" ] && CMDLINE["${KEY}"]="${VALUE}" -done < <(readModelMap "${MODEL}" "builds.${BUILD}.cmdline") +done < <(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].cmdline") while IFS=': ' read KEY VALUE; do [ -n "${KEY}" ] && CMDLINE["${KEY}"]="${VALUE}" done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}") # -KVER=$(readModelKey "${MODEL}" "builds.${BUILD}.kver") +KVER=$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver") if [ "${BUS}" = "ata" ]; then LOADER_DEVICE_NAME=$(echo ${LOADER_DISK} | sed 's|/dev/||') diff --git a/files/board/arpl/overlayfs/opt/arpl/init.sh b/files/board/arpl/overlayfs/opt/arpl/init.sh index dc2dc5eb..6ea9b206 100755 --- a/files/board/arpl/overlayfs/opt/arpl/init.sh +++ b/files/board/arpl/overlayfs/opt/arpl/init.sh @@ -77,7 +77,11 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then writeConfigKey "notsetmacs" "false" "${USER_CONFIG_FILE}" writeConfigKey "bootipwait" "10" "${USER_CONFIG_FILE}" writeConfigKey "model" "" "${USER_CONFIG_FILE}" - writeConfigKey "build" "" "${USER_CONFIG_FILE}" + writeConfigKey "productver" "" "${USER_CONFIG_FILE}" + writeConfigKey "buildnum" "" "${USER_CONFIG_FILE}" + writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}" + writeConfigKey "paturl" "" "${USER_CONFIG_FILE}" + writeConfigKey "patsum" "" "${USER_CONFIG_FILE}" writeConfigKey "sn" "" "${USER_CONFIG_FILE}" # writeConfigKey "maxdisks" "" "${USER_CONFIG_FILE}" writeConfigKey "layout" "qwerty" "${USER_CONFIG_FILE}" diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot index 7ce46031..81627b5c 100644 --- a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot +++ b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-26 20:21+0800\n" +"POT-Creation-Date: 2023-07-05 17:01+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: boot.sh:8 init.sh:162 +#: boot.sh:8 init.sh:166 msgid "Loader is not configured!" msgstr "" @@ -29,12 +29,12 @@ msgstr "" msgid "DSM zImage changed" msgstr "" -#: boot.sh:35 boot.sh:47 menu.sh:735 menu.sh:743 menu.sh:769 menu.sh:797 -#: menu.sh:809 menu.sh:833 menu.sh:841 menu.sh:874 menu.sh:887 menu.sh:894 +#: boot.sh:35 boot.sh:47 menu.sh:784 menu.sh:792 menu.sh:818 menu.sh:846 +#: menu.sh:858 menu.sh:882 menu.sh:890 menu.sh:923 menu.sh:936 menu.sh:943 msgid "Error" msgstr "" -#: boot.sh:36 menu.sh:888 +#: boot.sh:36 menu.sh:937 msgid "zImage not patched:\\n" msgstr "" @@ -42,82 +42,82 @@ msgstr "" msgid "DSM Ramdisk changed" msgstr "" -#: boot.sh:48 menu.sh:895 +#: boot.sh:48 menu.sh:944 msgid "Ramdisk not patched:\\n" msgstr "" -#: boot.sh:65 +#: boot.sh:66 msgid "Model:" msgstr "" -#: boot.sh:66 +#: boot.sh:67 msgid "Build:" msgstr "" -#: boot.sh:67 +#: boot.sh:68 msgid "LKM: " msgstr "" -#: boot.sh:68 +#: boot.sh:69 msgid "CPU: " msgstr "" -#: boot.sh:69 +#: boot.sh:70 msgid "MEM: " msgstr "" -#: boot.sh:72 +#: boot.sh:73 msgid "" "The current version of arpl does not support booting %s-%s, please rebuild." msgstr "" -#: boot.sh:113 +#: boot.sh:114 msgid "'Not set MACs' is enabled." msgstr "" -#: boot.sh:127 +#: boot.sh:128 msgid "" "Detected %s network cards, %s MACs were customized, the rest will use the " "original MACs." msgstr "" -#: boot.sh:157 +#: boot.sh:158 msgid "Cmdline:\\n" msgstr "" -#: boot.sh:162 +#: boot.sh:163 msgid "Reboot to boot directly in DSM" msgstr "" -#: boot.sh:172 +#: boot.sh:173 msgid "Detected %s network cards, Waiting IP.(For reference only)" msgstr "" -#: boot.sh:179 init.sh:182 +#: boot.sh:180 init.sh:186 msgid "DOWN" msgstr "" -#: boot.sh:183 init.sh:186 +#: boot.sh:184 init.sh:190 msgid "ERROR" msgstr "" -#: boot.sh:189 +#: boot.sh:190 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web." msgstr "" -#: boot.sh:198 +#: boot.sh:199 msgid "Loading DSM kernel..." msgstr "" -#: boot.sh:202 +#: boot.sh:203 msgid "Warning, running kexec with --noefi param, strange things will happen!!" msgstr "" -#: boot.sh:207 +#: boot.sh:208 msgid "Booting..." msgstr "" -#: boot.sh:209 +#: boot.sh:210 msgid "" "[This interface will not be operational. Please use the http://find.synology." "com/ find DSM and connect.]" @@ -139,932 +139,940 @@ msgstr "" msgid "Can't mount %s" msgstr "" -#: init.sh:105 +#: init.sh:109 msgid "Setting %s MAC to %s" msgstr "" -#: init.sh:123 +#: init.sh:127 msgid "Loader disk neither USB or DoM" msgstr "" -#: init.sh:131 +#: init.sh:135 msgid "Loader disk:" msgstr "" -#: init.sh:144 +#: init.sh:148 msgid "Resizing %s" msgstr "" -#: init.sh:155 +#: init.sh:159 msgid "Loading keymap" msgstr "" -#: init.sh:165 +#: init.sh:169 msgid "User requested edit settings." msgstr "" -#: init.sh:175 +#: init.sh:179 msgid "Detected %s network cards, Waiting IP." msgstr "" -#: init.sh:192 +#: init.sh:196 msgid "" "Access \\033[1;34mhttp://%s:7681\\033[0m to configure the loader via web " "terminal." msgstr "" -#: init.sh:202 +#: init.sh:206 msgid "Call \\033[1;32mmenu.sh\\033[0m to configure loader" msgstr "" -#: init.sh:204 +#: init.sh:208 msgid "User config is on" msgstr "" -#: init.sh:205 +#: init.sh:209 msgid "Default SSH Root password is" msgstr "" -#: init.sh:211 +#: init.sh:215 msgid "" "You have less than 4GB of RAM, if errors occur in loader creation, please " "increase the amount of memory." msgstr "" -#: menu.sh:76 +#: menu.sh:83 msgid "Model" msgstr "" -#: menu.sh:77 +#: menu.sh:84 msgid "Reading models" msgstr "" -#: menu.sh:102 +#: menu.sh:109 msgid "Disable flags restriction" msgstr "" -#: menu.sh:103 +#: menu.sh:110 msgid "Show beta models" msgstr "" -#: menu.sh:105 +#: menu.sh:112 msgid "Choose the model" msgstr "" -#: menu.sh:144 +#: menu.sh:154 msgid "Choose a build number" msgstr "" -#: menu.sh:156 menu.sh:161 menu.sh:165 +#: menu.sh:166 menu.sh:171 menu.sh:176 menu.sh:201 menu.sh:216 msgid "Build Number" msgstr "" -#: menu.sh:157 +#: menu.sh:167 msgid "" "This version does not support UEFI startup, Please select another version or " "switch the startup mode." msgstr "" -#: menu.sh:162 +#: menu.sh:172 msgid "" "This version only support usb startup, Please select another version or " "switch the startup mode." msgstr "" -#: menu.sh:166 +#: menu.sh:177 +msgid "Get online pat data .." +msgstr "" + +#: menu.sh:217 msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "" -#: menu.sh:211 menu.sh:354 menu.sh:495 menu.sh:634 menu.sh:1560 +#: menu.sh:259 menu.sh:402 menu.sh:543 menu.sh:684 menu.sh:1630 msgid "Choose a option" msgstr "" -#: menu.sh:212 +#: menu.sh:260 msgid "Add an addon" msgstr "" -#: menu.sh:213 +#: menu.sh:261 msgid "Delete addon(s)" msgstr "" -#: menu.sh:214 +#: menu.sh:262 msgid "Show user addons" msgstr "" -#: menu.sh:215 +#: menu.sh:263 msgid "Show all available addons" msgstr "" -#: menu.sh:216 +#: menu.sh:264 msgid "Upload a external addon" msgstr "" -#: menu.sh:217 menu.sh:361 menu.sh:491 menu.sh:629 menu.sh:942 menu.sh:1567 -#: menu.sh:1715 +#: menu.sh:265 menu.sh:409 menu.sh:539 menu.sh:679 menu.sh:992 menu.sh:1637 +#: menu.sh:1785 msgid "Exit" msgstr "" -#: menu.sh:229 menu.sh:234 menu.sh:240 menu.sh:251 menu.sh:259 menu.sh:277 -#: menu.sh:291 menu.sh:296 menu.sh:300 menu.sh:314 menu.sh:318 menu.sh:325 -#: menu.sh:328 menu.sh:1694 +#: menu.sh:277 menu.sh:282 menu.sh:288 menu.sh:299 menu.sh:307 menu.sh:325 +#: menu.sh:339 menu.sh:344 menu.sh:348 menu.sh:362 menu.sh:366 menu.sh:373 +#: menu.sh:376 menu.sh:1764 msgid "Addons" msgstr "" -#: menu.sh:230 +#: menu.sh:278 msgid "No available addons to add" msgstr "" -#: menu.sh:235 +#: menu.sh:283 msgid "Select an addon" msgstr "" -#: menu.sh:241 +#: menu.sh:289 msgid "Type a opcional params to addon" msgstr "" -#: menu.sh:252 +#: menu.sh:300 msgid "No user addons to remove" msgstr "" -#: menu.sh:260 +#: menu.sh:308 msgid "Select addon to remove" msgstr "" -#: menu.sh:297 menu.sh:1174 menu.sh:1205 menu.sh:1238 menu.sh:1629 +#: menu.sh:345 menu.sh:1233 menu.sh:1264 menu.sh:1297 menu.sh:1699 msgid "This feature is only available when accessed via web/ssh." msgstr "" -#: menu.sh:301 +#: menu.sh:349 msgid "Please upload the *.addons file." msgstr "" -#: menu.sh:315 menu.sh:466 menu.sh:1656 menu.sh:1670 +#: menu.sh:363 menu.sh:514 menu.sh:1726 menu.sh:1740 msgid "Not a valid file, please try again!" msgstr "" -#: menu.sh:319 +#: menu.sh:367 msgid "The addon already exists. Do you want to overwrite it?" msgstr "" -#: menu.sh:326 +#: menu.sh:374 msgid "Addon '%s' added to loader, Please enable it in 'Add an addon' menu." msgstr "" -#: menu.sh:329 +#: menu.sh:377 msgid "File format not recognized!" msgstr "" -#: menu.sh:342 menu.sh:370 menu.sh:374 menu.sh:391 menu.sh:404 menu.sh:418 -#: menu.sh:424 menu.sh:443 menu.sh:446 menu.sh:461 menu.sh:465 menu.sh:1695 +#: menu.sh:390 menu.sh:418 menu.sh:422 menu.sh:439 menu.sh:452 menu.sh:466 +#: menu.sh:472 menu.sh:491 menu.sh:494 menu.sh:509 menu.sh:513 menu.sh:1765 msgid "Modules" msgstr "" -#: menu.sh:343 +#: menu.sh:391 msgid "Reading modules" msgstr "" -#: menu.sh:355 +#: menu.sh:403 msgid "Show selected modules" msgstr "" -#: menu.sh:356 +#: menu.sh:404 msgid "Select loaded modules" msgstr "" -#: menu.sh:357 +#: menu.sh:405 msgid "Select all modules" msgstr "" -#: menu.sh:358 +#: menu.sh:406 msgid "Deselect all modules" msgstr "" -#: menu.sh:359 +#: menu.sh:407 msgid "Choose modules to include" msgstr "" -#: menu.sh:360 +#: menu.sh:408 msgid "Upload a external module" msgstr "" -#: menu.sh:375 +#: menu.sh:423 msgid "Selecting loaded modules" msgstr "" -#: menu.sh:392 +#: menu.sh:440 msgid "Selecting all modules" msgstr "" -#: menu.sh:405 +#: menu.sh:453 msgid "Deselecting all modules" msgstr "" -#: menu.sh:419 +#: menu.sh:467 msgid "Select modules to include" msgstr "" -#: menu.sh:425 +#: menu.sh:473 msgid "Writing to user config" msgstr "" -#: menu.sh:438 +#: menu.sh:486 msgid "" "This function is experimental and dangerous. If you don't know much, please " "exit.\\n" msgstr "" -#: menu.sh:439 +#: menu.sh:487 msgid "" "The imported .ko of this function will be implanted into the corresponding " "arch's modules package, which will affect all models of the arch.\\n" msgstr "" -#: menu.sh:440 +#: menu.sh:488 msgid "" "This program will not determine the availability of imported modules or even " "make type judgments, as please double check if it is correct.\\n" msgstr "" -#: menu.sh:441 +#: menu.sh:489 msgid "" "If you want to remove it, please go to the \"Update Menu\" -> \"Update " "modules\" to forcibly update the modules. All imports will be reset.\\n" msgstr "" -#: menu.sh:442 +#: menu.sh:490 msgid "Do you want to continue?" msgstr "" -#: menu.sh:447 +#: menu.sh:495 msgid "Please upload the *.ko file." msgstr "" -#: menu.sh:462 +#: menu.sh:510 msgid "Module '%s' added to %s-%s" msgstr "" -#: menu.sh:483 +#: menu.sh:531 msgid "Add/edit a cmdline item" msgstr "" -#: menu.sh:484 +#: menu.sh:532 msgid "Delete cmdline item(s)" msgstr "" -#: menu.sh:486 +#: menu.sh:534 msgid "Define a serial number" msgstr "" -#: menu.sh:488 +#: menu.sh:536 msgid "Define a custom MAC" msgstr "" -#: menu.sh:489 +#: menu.sh:537 msgid "Show user added cmdline" msgstr "" -#: menu.sh:490 +#: menu.sh:538 msgid "Show model inherent cmdline" msgstr "" -#: menu.sh:500 menu.sh:506 menu.sh:516 menu.sh:524 menu.sh:537 menu.sh:547 -#: menu.sh:564 menu.sh:574 menu.sh:584 menu.sh:587 menu.sh:590 menu.sh:601 -#: menu.sh:609 +#: menu.sh:548 menu.sh:554 menu.sh:564 menu.sh:572 menu.sh:585 menu.sh:597 +#: menu.sh:614 menu.sh:624 menu.sh:634 menu.sh:637 menu.sh:640 menu.sh:651 +#: menu.sh:659 msgid "Cmdline" msgstr "" -#: menu.sh:501 +#: menu.sh:549 msgid "Type a name of cmdline" msgstr "" -#: menu.sh:507 +#: menu.sh:555 msgid "Type a value of '%s' cmdline" msgstr "" -#: menu.sh:517 +#: menu.sh:565 msgid "No user cmdline to remove" msgstr "" -#: menu.sh:525 +#: menu.sh:573 msgid "Select cmdline to remove" msgstr "" -#: menu.sh:538 +#: menu.sh:586 msgid "Please enter a serial number " msgstr "" -#: menu.sh:548 +#: menu.sh:598 msgid "Invalid serial, continue?" msgstr "" -#: menu.sh:565 +#: menu.sh:615 msgid "Type a custom MAC address of %s" msgstr "" -#: menu.sh:575 +#: menu.sh:625 msgid "Invalid MAC" msgstr "" -#: menu.sh:585 +#: menu.sh:635 msgid "Changing MAC" msgstr "" -#: menu.sh:588 +#: menu.sh:638 msgid "Renewing IP" msgstr "" -#: menu.sh:591 +#: menu.sh:641 msgid "Continue to custom MAC?" msgstr "" -#: menu.sh:626 +#: menu.sh:676 msgid "Add/edit a synoinfo item" msgstr "" -#: menu.sh:627 +#: menu.sh:677 msgid "Delete synoinfo item(s)" msgstr "" -#: menu.sh:628 +#: menu.sh:678 msgid "Show synoinfo entries" msgstr "" -#: menu.sh:639 menu.sh:645 menu.sh:656 menu.sh:664 menu.sh:681 +#: menu.sh:689 menu.sh:695 menu.sh:706 menu.sh:714 menu.sh:731 msgid "Synoinfo" msgstr "" -#: menu.sh:640 +#: menu.sh:690 msgid "Type a name of synoinfo entry" msgstr "" -#: menu.sh:646 +#: menu.sh:696 msgid "Type a value of '%s' synoinfo entry" msgstr "" -#: menu.sh:657 +#: menu.sh:707 msgid "No synoinfo entries to remove" msgstr "" -#: menu.sh:665 +#: menu.sh:715 msgid "Select synoinfo entry to remove" msgstr "" -#: menu.sh:704 +#: menu.sh:754 msgid "%s cached." msgstr "" -#: menu.sh:708 +#: menu.sh:758 msgid "Cleaning cache" msgstr "" -#: menu.sh:720 +#: menu.sh:770 msgid "" "Based on the current network situation, switch to %s mirror to downloading." msgstr "" -#: menu.sh:725 +#: menu.sh:774 msgid "Downloading %s" msgstr "" -#: menu.sh:736 menu.sh:798 +#: menu.sh:785 menu.sh:847 msgid "Check internet or cache disk space" msgstr "" -#: menu.sh:741 +#: menu.sh:790 msgid "Checking hash of %s: " msgstr "" -#: menu.sh:744 +#: menu.sh:793 msgid "md5 Hash of pat not match, try again!" msgstr "" -#: menu.sh:748 menu.sh:850 menu.sh:860 +#: menu.sh:797 menu.sh:899 menu.sh:909 msgid "OK" msgstr "" -#: menu.sh:752 +#: menu.sh:801 msgid "Disassembling %s: " msgstr "" -#: menu.sh:757 +#: menu.sh:806 msgid "Uncompressed tar" msgstr "" -#: menu.sh:761 +#: menu.sh:810 msgid "Compressed tar" msgstr "" -#: menu.sh:765 +#: menu.sh:814 msgid "Encrypted" msgstr "" -#: menu.sh:770 +#: menu.sh:819 msgid "" "Could not determine if pat file is encrypted or not, maybe corrupted, try " "again!" msgstr "" -#: menu.sh:780 +#: menu.sh:829 msgid "Extractor cached." msgstr "" -#: menu.sh:787 +#: menu.sh:836 msgid "Downloading old pat to extract synology .pat extractor..." msgstr "" -#: menu.sh:827 menu.sh:830 +#: menu.sh:876 menu.sh:879 msgid "Extracting..." msgstr "" -#: menu.sh:842 +#: menu.sh:891 msgid "pat Invalid, try again!" msgstr "" -#: menu.sh:845 +#: menu.sh:894 msgid "Setting hash: " msgstr "" -#: menu.sh:852 +#: menu.sh:901 msgid "Copying files: " msgstr "" -#: menu.sh:875 +#: menu.sh:924 msgid "Addon %s not found!" msgstr "" -#: menu.sh:899 menu.sh:1764 +#: menu.sh:950 menu.sh:1834 msgid "Cleaning" msgstr "" -#: menu.sh:902 +#: menu.sh:952 msgid "Ready!" msgstr "" -#: menu.sh:915 +#: menu.sh:965 msgid "Switch LKM version:" msgstr "" -#: menu.sh:918 +#: menu.sh:968 msgid "Switch direct boot:" msgstr "" -#: menu.sh:920 +#: menu.sh:970 msgid "boot IPs wait time:" msgstr "" -#: menu.sh:923 +#: menu.sh:973 msgid "Switch 'not set MACs':" msgstr "" -#: menu.sh:924 +#: menu.sh:974 msgid "Edit user config file manually" msgstr "" -#: menu.sh:925 +#: menu.sh:975 msgid "Try to recovery a DSM installed system" msgstr "" -#: menu.sh:926 +#: menu.sh:976 msgid "Show SATA(s) # ports and drives" msgstr "" -#: menu.sh:928 -msgid "show pat download link" +#: menu.sh:978 +msgid "show/modify the current pat data" msgstr "" -#: menu.sh:930 +#: menu.sh:980 msgid "Allow downgrade installation" msgstr "" -#: menu.sh:931 +#: menu.sh:981 msgid "Format disk(s) # Without loader disk" msgstr "" -#: menu.sh:932 +#: menu.sh:982 msgid "Reset syno system password" msgstr "" -#: menu.sh:933 +#: menu.sh:983 msgid "Persistence of arpl modifications" msgstr "" -#: menu.sh:935 +#: menu.sh:985 msgid "Custom dts file # Need rebuild" msgstr "" -#: menu.sh:938 +#: menu.sh:988 msgid "Backup bootloader disk # test" msgstr "" -#: menu.sh:939 +#: menu.sh:989 msgid "Restore bootloader disk # test" msgstr "" -#: menu.sh:941 +#: menu.sh:991 msgid "Development tools" msgstr "" -#: menu.sh:944 menu.sh:962 menu.sh:1022 menu.sh:1030 menu.sh:1038 menu.sh:1051 -#: menu.sh:1054 menu.sh:1069 menu.sh:1070 menu.sh:1075 menu.sh:1079 -#: menu.sh:1090 menu.sh:1092 menu.sh:1109 menu.sh:1114 menu.sh:1122 -#: menu.sh:1128 menu.sh:1141 menu.sh:1144 menu.sh:1150 menu.sh:1153 -#: menu.sh:1168 menu.sh:1173 menu.sh:1177 menu.sh:1192 menu.sh:1197 -#: menu.sh:1204 menu.sh:1208 menu.sh:1211 menu.sh:1216 menu.sh:1226 -#: menu.sh:1231 menu.sh:1237 menu.sh:1241 menu.sh:1258 menu.sh:1261 -#: menu.sh:1267 menu.sh:1275 menu.sh:1283 menu.sh:1292 menu.sh:1294 +#: menu.sh:994 menu.sh:1012 menu.sh:1072 menu.sh:1079 menu.sh:1097 menu.sh:1110 +#: menu.sh:1113 menu.sh:1128 menu.sh:1129 menu.sh:1134 menu.sh:1138 +#: menu.sh:1149 menu.sh:1151 menu.sh:1168 menu.sh:1173 menu.sh:1181 +#: menu.sh:1187 menu.sh:1200 menu.sh:1203 menu.sh:1209 menu.sh:1212 +#: menu.sh:1227 menu.sh:1232 menu.sh:1236 menu.sh:1251 menu.sh:1256 +#: menu.sh:1263 menu.sh:1267 menu.sh:1270 menu.sh:1275 menu.sh:1285 +#: menu.sh:1290 menu.sh:1296 menu.sh:1300 menu.sh:1317 menu.sh:1320 +#: menu.sh:1326 menu.sh:1334 menu.sh:1342 menu.sh:1351 menu.sh:1353 msgid "Advanced" msgstr "" -#: menu.sh:945 menu.sh:1718 +#: menu.sh:995 menu.sh:1788 msgid "Choose the option" msgstr "" -#: menu.sh:963 +#: menu.sh:1013 msgid "Choose a waiting time(seconds)" msgstr "" -#: menu.sh:1018 +#: menu.sh:1068 msgid "\\nTotal of ports: %s\\n" msgstr "" -#: menu.sh:1019 +#: menu.sh:1069 msgid "" "\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive " "connected." msgstr "" -#: menu.sh:1020 +#: menu.sh:1070 msgid "\\nRecommended value:" msgstr "" -#: menu.sh:1021 +#: menu.sh:1071 msgid "\\nDiskIdxMap:" msgstr "" -#: menu.sh:1035 +#: menu.sh:1078 +msgid "pat: (editable)" +msgstr "" + +#: menu.sh:1094 msgid "" "This feature will allow you to downgrade the installation by removing the " "VERSION file from the first partition of all disks.\\n" msgstr "" -#: menu.sh:1036 +#: menu.sh:1095 msgid "Therefore, please insert all disks before continuing.\\n" msgstr "" -#: menu.sh:1037 menu.sh:1076 +#: menu.sh:1096 menu.sh:1135 msgid "" "Warning:\\nThis operation is irreversible. Please backup important data. Do " "you want to continue?" msgstr "" -#: menu.sh:1052 +#: menu.sh:1111 msgid "Removing ..." msgstr "" -#: menu.sh:1053 +#: menu.sh:1112 msgid "Remove VERSION file for all disks completed." msgstr "" -#: menu.sh:1080 +#: menu.sh:1139 msgid "" "Warning:\\nThe current hds is in raid, do you still want to format them?" msgstr "" -#: menu.sh:1091 +#: menu.sh:1150 msgid "Formatting ..." msgstr "" -#: menu.sh:1093 +#: menu.sh:1152 msgid "Formatting is complete." msgstr "" -#: menu.sh:1110 +#: menu.sh:1169 msgid "The installed Syno system not found in the currently inserted disks!" msgstr "" -#: menu.sh:1115 +#: menu.sh:1174 msgid "Choose a user name" msgstr "" -#: menu.sh:1123 +#: menu.sh:1182 msgid "Type a new password for user '%s'" msgstr "" -#: menu.sh:1129 +#: menu.sh:1188 msgid "Invalid password" msgstr "" -#: menu.sh:1142 +#: menu.sh:1201 msgid "Resetting ..." msgstr "" -#: menu.sh:1145 +#: menu.sh:1204 msgid "Password reset completed." msgstr "" -#: menu.sh:1151 menu.sh:1209 menu.sh:1262 +#: menu.sh:1210 menu.sh:1268 menu.sh:1321 msgid "" "Warning:\\nDo not terminate midway, otherwise it may cause damage to the " "arpl. Do you want to continue?" msgstr "" -#: menu.sh:1154 +#: menu.sh:1213 msgid "Persisting ..." msgstr "" -#: menu.sh:1169 +#: menu.sh:1228 msgid "Persisting is complete." msgstr "" -#: menu.sh:1178 +#: menu.sh:1237 msgid "" "Currently, only dts format files are supported. Please prepare and click to " "confirm uploading.\\n(saved in /mnt/p3/users/)" msgstr "" -#: menu.sh:1193 +#: menu.sh:1252 msgid "Not a valid dts file, please try again!" msgstr "" -#: menu.sh:1198 +#: menu.sh:1257 msgid "A valid dts file, Automatically import at compile time." msgstr "" -#: menu.sh:1212 +#: menu.sh:1271 msgid "Backuping..." msgstr "" -#: menu.sh:1217 +#: menu.sh:1276 msgid "" "Failed to generate backup. There may be insufficient memory. Please clear " "the cache and try again!" msgstr "" -#: menu.sh:1224 +#: menu.sh:1283 msgid "Click on the address above to download." msgstr "" -#: menu.sh:1225 +#: menu.sh:1284 msgid "" "Please confirm the completion of the download before closing this window." msgstr "" -#: menu.sh:1232 +#: menu.sh:1291 msgid "backup is complete." msgstr "" -#: menu.sh:1242 +#: menu.sh:1301 msgid "" "Please upload the backup file.\\nCurrently, zip(github) and img.gz(backup) " "compressed file formats are supported." msgstr "" -#: menu.sh:1259 +#: menu.sh:1318 msgid "Not a valid .zip/.img.gz file, please try again!" msgstr "" -#: menu.sh:1268 +#: menu.sh:1327 msgid "Writing..." msgstr "" -#: menu.sh:1276 +#: menu.sh:1335 msgid "Restore bootloader disk with success to %s!\\nReboot?" msgstr "" -#: menu.sh:1284 +#: menu.sh:1343 msgid "" "This option only installs opkg package management, allowing you to install " "more tools for use and debugging. Do you want to continue?" msgstr "" -#: menu.sh:1293 +#: menu.sh:1352 msgid "opkg installing ..." msgstr "" -#: menu.sh:1295 +#: menu.sh:1354 msgid "" "opkg install is complete. Please reconnect to SSH/web, or execute 'source ~/." "bashrc'" msgstr "" -#: menu.sh:1305 menu.sh:1333 menu.sh:1340 +#: menu.sh:1364 menu.sh:1401 menu.sh:1408 msgid "Try recovery DSM" msgstr "" -#: menu.sh:1306 +#: menu.sh:1365 msgid "Trying to recovery a DSM installed system" msgstr "" -#: menu.sh:1327 -msgid "Found a installation:\\nModel: %s\\nBuildnumber: %s" +#: menu.sh:1391 +msgid "Found a installation:\\nModel: %s\\nProductversion: %s" msgstr "" -#: menu.sh:1331 +#: menu.sh:1395 msgid "\\nSerial: %s" msgstr "" -#: menu.sh:1341 +#: menu.sh:1409 msgid "Unfortunately I couldn't mount the DSM partition!" msgstr "" -#: menu.sh:1349 menu.sh:1355 +#: menu.sh:1417 menu.sh:1423 msgid "Edit with caution" msgstr "" -#: menu.sh:1375 +#: menu.sh:1445 msgid "Alert" msgstr "" -#: menu.sh:1376 +#: menu.sh:1446 msgid "Config changed, would you like to rebuild the loader?" msgstr "" -#: menu.sh:1388 menu.sh:1709 +#: menu.sh:1458 menu.sh:1779 msgid "Choose a language" msgstr "" -#: menu.sh:1402 +#: menu.sh:1472 msgid "Choose a layout" msgstr "" -#: menu.sh:1414 +#: menu.sh:1484 msgid "Choice a keymap" msgstr "" -#: menu.sh:1432 menu.sh:1465 menu.sh:1516 menu.sh:1572 menu.sh:1580 -#: menu.sh:1588 menu.sh:1596 +#: menu.sh:1502 menu.sh:1535 menu.sh:1586 menu.sh:1642 menu.sh:1650 +#: menu.sh:1658 menu.sh:1666 msgid "Update %s" msgstr "" -#: menu.sh:1435 +#: menu.sh:1505 msgid "Checking last version" msgstr "" -#: menu.sh:1443 +#: menu.sh:1513 msgid "Error checking new version" msgstr "" -#: menu.sh:1448 +#: menu.sh:1518 msgid "No new version. Actual version is %s\\nForce update?" msgstr "" -#: menu.sh:1452 +#: menu.sh:1522 msgid "Downloading last version" msgstr "" -#: menu.sh:1457 +#: menu.sh:1527 msgid "Error downloading new version" msgstr "" -#: menu.sh:1467 menu.sh:1518 +#: menu.sh:1537 menu.sh:1588 msgid "Extracting last version" msgstr "" -#: menu.sh:1471 +#: menu.sh:1541 msgid "Error extracting update file" msgstr "" -#: menu.sh:1478 +#: menu.sh:1548 msgid "Checksum do not match!" msgstr "" -#: menu.sh:1487 +#: menu.sh:1557 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "" -#: menu.sh:1492 +#: menu.sh:1562 msgid "Installing new files" msgstr "" -#: menu.sh:1509 +#: menu.sh:1579 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "" -#: menu.sh:1524 +#: menu.sh:1594 msgid "Installing new %s" msgstr "" -#: menu.sh:1549 +#: menu.sh:1621 msgid "%s updated with success!" msgstr "" -#: menu.sh:1561 +#: menu.sh:1631 msgid "Update arpl" msgstr "" -#: menu.sh:1562 +#: menu.sh:1632 msgid "Update addons" msgstr "" -#: menu.sh:1563 +#: menu.sh:1633 msgid "Update modules" msgstr "" -#: menu.sh:1564 +#: menu.sh:1634 msgid "Update LKMs" msgstr "" -#: menu.sh:1565 +#: menu.sh:1635 msgid "Set proxy server" msgstr "" -#: menu.sh:1566 +#: menu.sh:1636 msgid "Local upload" msgstr "" -#: menu.sh:1572 +#: menu.sh:1642 msgid "arpl" msgstr "" -#: menu.sh:1580 +#: menu.sh:1650 msgid "addons" msgstr "" -#: menu.sh:1588 +#: menu.sh:1658 msgid "modules" msgstr "" -#: menu.sh:1596 +#: menu.sh:1666 msgid "LKMs" msgstr "" -#: menu.sh:1606 menu.sh:1617 menu.sh:1628 menu.sh:1638 menu.sh:1655 -#: menu.sh:1669 +#: menu.sh:1676 menu.sh:1687 menu.sh:1698 menu.sh:1708 menu.sh:1725 +#: menu.sh:1739 msgid "Update" msgstr "" -#: menu.sh:1607 +#: menu.sh:1677 msgid "Please enter a proxy server url" msgstr "" -#: menu.sh:1618 +#: menu.sh:1688 msgid "Invalid proxy server url, continue?" msgstr "" -#: menu.sh:1633 +#: menu.sh:1703 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "" -#: menu.sh:1634 +#: menu.sh:1704 msgid "Upload update.zip will update arpl.\\n" msgstr "" -#: menu.sh:1635 +#: menu.sh:1705 msgid "Upload addons.zip will update Addons.\\n" msgstr "" -#: menu.sh:1636 +#: menu.sh:1706 msgid "Upload modules.zip will update Modules.\\n" msgstr "" -#: menu.sh:1637 +#: menu.sh:1707 msgid "Upload rp-lkms.zip will update LKMs.\\n" msgstr "" -#: menu.sh:1690 +#: menu.sh:1760 msgid "Choose a model" msgstr "" -#: menu.sh:1692 -msgid "Choose a Build Number" +#: menu.sh:1762 +msgid "Choose a product version" msgstr "" -#: menu.sh:1696 +#: menu.sh:1766 msgid "Cmdline menu" msgstr "" -#: menu.sh:1697 +#: menu.sh:1767 msgid "Synoinfo menu" msgstr "" -#: menu.sh:1700 +#: menu.sh:1770 msgid "Advanced menu" msgstr "" -#: menu.sh:1703 +#: menu.sh:1773 msgid "Build the loader" msgstr "" -#: menu.sh:1707 +#: menu.sh:1777 msgid "Boot the loader" msgstr "" -#: menu.sh:1710 +#: menu.sh:1780 msgid "Choose a keymap" msgstr "" -#: menu.sh:1712 +#: menu.sh:1782 msgid "Clean disk cache" msgstr "" -#: menu.sh:1714 +#: menu.sh:1784 msgid "Update menu" msgstr "" -#: menu.sh:1776 +#: menu.sh:1846 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "" diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo index 247c9aa2..9ef04ef6 100644 Binary files a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo and b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo differ diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po index 3967b45a..6ab147dc 100644 --- a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po +++ b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: arpl-i18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-26 20:21+0800\n" -"PO-Revision-Date: 2023-06-26 20:21+0800\n" +"POT-Creation-Date: 2023-07-05 17:01+0800\n" +"PO-Revision-Date: 2023-07-05 17:01+0800\n" "Last-Translator: ing \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: boot.sh:8 init.sh:162 +#: boot.sh:8 init.sh:166 msgid "Loader is not configured!" msgstr "引导未配置" @@ -28,12 +28,12 @@ msgstr "" msgid "DSM zImage changed" msgstr "DSM zImage 已更改" -#: boot.sh:35 boot.sh:47 menu.sh:735 menu.sh:743 menu.sh:769 menu.sh:797 -#: menu.sh:809 menu.sh:833 menu.sh:841 menu.sh:874 menu.sh:887 menu.sh:894 +#: boot.sh:35 boot.sh:47 menu.sh:784 menu.sh:792 menu.sh:818 menu.sh:846 +#: menu.sh:858 menu.sh:882 menu.sh:890 menu.sh:923 menu.sh:936 menu.sh:943 msgid "Error" msgstr "错误" -#: boot.sh:36 menu.sh:888 +#: boot.sh:36 menu.sh:937 msgid "zImage not patched:\\n" msgstr "zImage打补丁失败:\\n" @@ -41,82 +41,82 @@ msgstr "zImage打补丁失败:\\n" msgid "DSM Ramdisk changed" msgstr "DSM Ramdisk 已更改" -#: boot.sh:48 menu.sh:895 +#: boot.sh:48 menu.sh:944 msgid "Ramdisk not patched:\\n" msgstr "Ramdisk打补丁失败:\\n" -#: boot.sh:65 +#: boot.sh:66 msgid "Model:" msgstr "型号: " -#: boot.sh:66 +#: boot.sh:67 msgid "Build:" msgstr "版本: " -#: boot.sh:67 +#: boot.sh:68 msgid "LKM: " msgstr "LKM: " -#: boot.sh:68 +#: boot.sh:69 msgid "CPU: " msgstr "CPU: " -#: boot.sh:69 +#: boot.sh:70 msgid "MEM: " msgstr "MEM: " -#: boot.sh:72 +#: boot.sh:73 msgid "" "The current version of arpl does not support booting %s-%s, please rebuild." msgstr "当前版本的arpl不支持引导 %s-%s, 请重新编译." -#: boot.sh:113 +#: boot.sh:114 msgid "'Not set MACs' is enabled." msgstr "'不设置MACs' 已开启" -#: boot.sh:127 +#: boot.sh:128 msgid "" "Detected %s network cards, %s MACs were customized, the rest will use the " "original MACs." msgstr "检测到 %s 个网卡, 自定义了 %s 个 MACs, 其他网卡将使用自身 MACs." -#: boot.sh:157 +#: boot.sh:158 msgid "Cmdline:\\n" msgstr "Cmdline:\\n" -#: boot.sh:162 +#: boot.sh:163 msgid "Reboot to boot directly in DSM" msgstr "重启并直接进入DSM引导" -#: boot.sh:172 +#: boot.sh:173 msgid "Detected %s network cards, Waiting IP.(For reference only)" msgstr "检测到 %s 个网卡, 获取 IP.(仅供参考)" -#: boot.sh:179 init.sh:182 +#: boot.sh:180 init.sh:186 msgid "DOWN" msgstr "卸载" -#: boot.sh:183 init.sh:186 +#: boot.sh:184 init.sh:190 msgid "ERROR" msgstr "错误" -#: boot.sh:189 +#: boot.sh:190 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web." msgstr "在浏览器中访问 \\033[1;34mhttp://%s:5000\\033[0m 链接 DSM." -#: boot.sh:198 +#: boot.sh:199 msgid "Loading DSM kernel..." msgstr "加载 DSM kernel..." -#: boot.sh:202 +#: boot.sh:203 msgid "Warning, running kexec with --noefi param, strange things will happen!!" msgstr "警告, 使用'--noefi'参数运行'kexec', 可能有不好的事情发生!!" -#: boot.sh:207 +#: boot.sh:208 msgid "Booting..." msgstr "引导中..." -#: boot.sh:209 +#: boot.sh:210 msgid "" "[This interface will not be operational. Please use the http://find.synology." "com/ find DSM and connect.]" @@ -138,932 +138,940 @@ msgstr "存在多个引导磁盘，请仅插入一个引导磁盘!" msgid "Can't mount %s" msgstr "挂载 %s 失败" -#: init.sh:105 +#: init.sh:109 msgid "Setting %s MAC to %s" msgstr "设置 %s 的MAC为 %s" -#: init.sh:123 +#: init.sh:127 msgid "Loader disk neither USB or DoM" msgstr "引导磁盘仅支持 USB 或者 DoM" -#: init.sh:131 +#: init.sh:135 msgid "Loader disk:" msgstr "引导盘:" -#: init.sh:144 +#: init.sh:148 msgid "Resizing %s" msgstr "重置 %s 大小" -#: init.sh:155 +#: init.sh:159 msgid "Loading keymap" msgstr "加载keymap" -#: init.sh:165 +#: init.sh:169 msgid "User requested edit settings." msgstr "用户触发编辑设置." -#: init.sh:175 +#: init.sh:179 msgid "Detected %s network cards, Waiting IP." msgstr "检测到 %s 个网卡, 获取 IP." -#: init.sh:192 +#: init.sh:196 msgid "" "Access \\033[1;34mhttp://%s:7681\\033[0m to configure the loader via web " "terminal." msgstr "在浏览器中访问 \\033[1;34mhttp://%s:7681\\033[0m 进入WEB终端进行配置." -#: init.sh:202 +#: init.sh:206 msgid "Call \\033[1;32mmenu.sh\\033[0m to configure loader" msgstr "执行 \\033[1;32mmenu.sh\\033[0m 进入设置菜单" -#: init.sh:204 +#: init.sh:208 msgid "User config is on" msgstr "用户配置文件位于" -#: init.sh:205 +#: init.sh:209 msgid "Default SSH Root password is" msgstr "默认SSH的root密码为" -#: init.sh:211 +#: init.sh:215 msgid "" "You have less than 4GB of RAM, if errors occur in loader creation, please " "increase the amount of memory." msgstr "您的RAM不足4GB, 如果在创建引导时出现错误，请增加内存." -#: menu.sh:76 +#: menu.sh:83 msgid "Model" msgstr "型号" -#: menu.sh:77 +#: menu.sh:84 msgid "Reading models" msgstr "读取型号" -#: menu.sh:102 +#: menu.sh:109 msgid "Disable flags restriction" msgstr "禁用标志限制" -#: menu.sh:103 +#: menu.sh:110 msgid "Show beta models" msgstr "显示测试型号" -#: menu.sh:105 +#: menu.sh:112 msgid "Choose the model" msgstr "选择型号" -#: menu.sh:144 +#: menu.sh:154 msgid "Choose a build number" msgstr "选择版本" -#: menu.sh:156 menu.sh:161 menu.sh:165 +#: menu.sh:166 menu.sh:171 menu.sh:176 menu.sh:201 menu.sh:216 msgid "Build Number" msgstr "版本" -#: menu.sh:157 +#: menu.sh:167 msgid "" "This version does not support UEFI startup, Please select another version or " "switch the startup mode." msgstr "该版本不支持UEFI启动, 请选择其他版本或者切换启动模式." -#: menu.sh:162 +#: menu.sh:172 msgid "" "This version only support usb startup, Please select another version or " "switch the startup mode." msgstr "该版本仅支持 usb 启动, 请选择其他版本或者切换启动模式." -#: menu.sh:166 +#: menu.sh:177 +msgid "Get online pat data .." +msgstr "获取线上pat数据 .." + +#: menu.sh:217 msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "重新配置 Syninfo, 插件和模块" -#: menu.sh:211 menu.sh:354 menu.sh:495 menu.sh:634 menu.sh:1560 +#: menu.sh:259 menu.sh:402 menu.sh:543 menu.sh:684 menu.sh:1630 msgid "Choose a option" msgstr "设置" -#: menu.sh:212 +#: menu.sh:260 msgid "Add an addon" msgstr "添加插件" -#: menu.sh:213 +#: menu.sh:261 msgid "Delete addon(s)" msgstr "删除插件(s)" -#: menu.sh:214 +#: menu.sh:262 msgid "Show user addons" msgstr "显示用户插件" -#: menu.sh:215 +#: menu.sh:263 msgid "Show all available addons" msgstr "显示所有可用插件" -#: menu.sh:216 +#: menu.sh:264 msgid "Upload a external addon" msgstr "上传外部插件" -#: menu.sh:217 menu.sh:361 menu.sh:491 menu.sh:629 menu.sh:942 menu.sh:1567 -#: menu.sh:1715 +#: menu.sh:265 menu.sh:409 menu.sh:539 menu.sh:679 menu.sh:992 menu.sh:1637 +#: menu.sh:1785 msgid "Exit" msgstr "退出" -#: menu.sh:229 menu.sh:234 menu.sh:240 menu.sh:251 menu.sh:259 menu.sh:277 -#: menu.sh:291 menu.sh:296 menu.sh:300 menu.sh:314 menu.sh:318 menu.sh:325 -#: menu.sh:328 menu.sh:1694 +#: menu.sh:277 menu.sh:282 menu.sh:288 menu.sh:299 menu.sh:307 menu.sh:325 +#: menu.sh:339 menu.sh:344 menu.sh:348 menu.sh:362 menu.sh:366 menu.sh:373 +#: menu.sh:376 menu.sh:1764 msgid "Addons" msgstr "插件" -#: menu.sh:230 +#: menu.sh:278 msgid "No available addons to add" msgstr "没有可用的插件可添加" -#: menu.sh:235 +#: menu.sh:283 msgid "Select an addon" msgstr "选择插件" -#: menu.sh:241 +#: menu.sh:289 msgid "Type a opcional params to addon" msgstr "输入插件的加载参数" -#: menu.sh:252 +#: menu.sh:300 msgid "No user addons to remove" msgstr "没有要删除的用户插件" -#: menu.sh:260 +#: menu.sh:308 msgid "Select addon to remove" msgstr "选择要删除的插件" -#: menu.sh:297 menu.sh:1174 menu.sh:1205 menu.sh:1238 menu.sh:1629 +#: menu.sh:345 menu.sh:1233 menu.sh:1264 menu.sh:1297 menu.sh:1699 msgid "This feature is only available when accessed via web/ssh." msgstr "此功能仅通过web/ssh访问时可用." -#: menu.sh:301 +#: menu.sh:349 msgid "Please upload the *.addons file." msgstr "请上传 *.addons 文件." -#: menu.sh:315 menu.sh:466 menu.sh:1656 menu.sh:1670 +#: menu.sh:363 menu.sh:514 menu.sh:1726 menu.sh:1740 msgid "Not a valid file, please try again!" msgstr "不是有效的文件, 请重试!" -#: menu.sh:319 +#: menu.sh:367 msgid "The addon already exists. Do you want to overwrite it?" msgstr "该插件已存在, 是否覆盖?" -#: menu.sh:326 +#: menu.sh:374 msgid "Addon '%s' added to loader, Please enable it in 'Add an addon' menu." msgstr "插件 '%s' 已添加到引导中, 请在'添加插件' 菜单中开启." -#: menu.sh:329 +#: menu.sh:377 msgid "File format not recognized!" msgstr "文件格式无法识别!" -#: menu.sh:342 menu.sh:370 menu.sh:374 menu.sh:391 menu.sh:404 menu.sh:418 -#: menu.sh:424 menu.sh:443 menu.sh:446 menu.sh:461 menu.sh:465 menu.sh:1695 +#: menu.sh:390 menu.sh:418 menu.sh:422 menu.sh:439 menu.sh:452 menu.sh:466 +#: menu.sh:472 menu.sh:491 menu.sh:494 menu.sh:509 menu.sh:513 menu.sh:1765 msgid "Modules" msgstr "模块" -#: menu.sh:343 +#: menu.sh:391 msgid "Reading modules" msgstr "读取模块中" -#: menu.sh:355 +#: menu.sh:403 msgid "Show selected modules" msgstr "显示已加载的模块" -#: menu.sh:356 +#: menu.sh:404 msgid "Select loaded modules" msgstr "选择已识别的模块" -#: menu.sh:357 +#: menu.sh:405 msgid "Select all modules" msgstr "选择所有模块" -#: menu.sh:358 +#: menu.sh:406 msgid "Deselect all modules" msgstr "取消所有模块" -#: menu.sh:359 +#: menu.sh:407 msgid "Choose modules to include" msgstr "选择要加载的模块" -#: menu.sh:360 +#: menu.sh:408 msgid "Upload a external module" msgstr "上传一个外部模块" -#: menu.sh:375 +#: menu.sh:423 msgid "Selecting loaded modules" msgstr "选择已识别的模块" -#: menu.sh:392 +#: menu.sh:440 msgid "Selecting all modules" msgstr "全选所有模块" -#: menu.sh:405 +#: menu.sh:453 msgid "Deselecting all modules" msgstr "取消所有模块" -#: menu.sh:419 +#: menu.sh:467 msgid "Select modules to include" msgstr "选择要加载的插件" -#: menu.sh:425 +#: menu.sh:473 msgid "Writing to user config" msgstr "写入用户配置" -#: menu.sh:438 +#: menu.sh:486 msgid "" "This function is experimental and dangerous. If you don't know much, please " "exit.\\n" msgstr "该功能是实验性的且危险的, 如果你不了解, 请退出.\\n" -#: menu.sh:439 +#: menu.sh:487 msgid "" "The imported .ko of this function will be implanted into the corresponding " "arch's modules package, which will affect all models of the arch.\\n" msgstr "该功能导入 .ko 将被植入相应的架构的模块包中, 这将影响该架构的所有型号.\\n" -#: menu.sh:440 +#: menu.sh:488 msgid "" "This program will not determine the availability of imported modules or even " "make type judgments, as please double check if it is correct.\\n" msgstr "该程序不会判断导入的驱动模块的可用性, 甚至不会做类型判断, 因从请你再三确认是否正确.\\n" -#: menu.sh:441 +#: menu.sh:489 msgid "" "If you want to remove it, please go to the \"Update Menu\" -> \"Update " "modules\" to forcibly update the modules. All imports will be reset.\\n" msgstr "如果您想删除它, 请转到 \"更新\"->\"更新模块\" 强制更新模块, 所有导入都将被重置.\\n" -#: menu.sh:442 +#: menu.sh:490 msgid "Do you want to continue?" msgstr "是否继续?" -#: menu.sh:447 +#: menu.sh:495 msgid "Please upload the *.ko file." msgstr "请上传 *.ko 文件." -#: menu.sh:462 +#: menu.sh:510 msgid "Module '%s' added to %s-%s" msgstr "模块 '%s' 已添加到 %s-%s" -#: menu.sh:483 +#: menu.sh:531 msgid "Add/edit a cmdline item" msgstr "添加/编辑cmdline参数" -#: menu.sh:484 +#: menu.sh:532 msgid "Delete cmdline item(s)" msgstr "删除cmdline参数(s)" -#: menu.sh:486 +#: menu.sh:534 msgid "Define a serial number" msgstr "自定义SN" -#: menu.sh:488 +#: menu.sh:536 msgid "Define a custom MAC" msgstr "自定义MAC" -#: menu.sh:489 +#: menu.sh:537 msgid "Show user added cmdline" msgstr "显示用户添加的cmdline参数" -#: menu.sh:490 +#: menu.sh:538 msgid "Show model inherent cmdline" msgstr "显示型号默认的cmdline参数" -#: menu.sh:500 menu.sh:506 menu.sh:516 menu.sh:524 menu.sh:537 menu.sh:547 -#: menu.sh:564 menu.sh:574 menu.sh:584 menu.sh:587 menu.sh:590 menu.sh:601 -#: menu.sh:609 +#: menu.sh:548 menu.sh:554 menu.sh:564 menu.sh:572 menu.sh:585 menu.sh:597 +#: menu.sh:614 menu.sh:624 menu.sh:634 menu.sh:637 menu.sh:640 menu.sh:651 +#: menu.sh:659 msgid "Cmdline" msgstr "Cmdline" -#: menu.sh:501 +#: menu.sh:549 msgid "Type a name of cmdline" msgstr "输入参数的名称" -#: menu.sh:507 +#: menu.sh:555 msgid "Type a value of '%s' cmdline" msgstr "输入 '%s' 参数的值" -#: menu.sh:517 +#: menu.sh:565 msgid "No user cmdline to remove" msgstr "没有用户参数被删除" -#: menu.sh:525 +#: menu.sh:573 msgid "Select cmdline to remove" msgstr "选择要删除的参数" -#: menu.sh:538 +#: menu.sh:586 msgid "Please enter a serial number " msgstr "请输入SN " -#: menu.sh:548 +#: menu.sh:598 msgid "Invalid serial, continue?" msgstr "SN无效, 是否继续?" -#: menu.sh:565 +#: menu.sh:615 msgid "Type a custom MAC address of %s" msgstr "输入 %s 的自定义MAC地址" -#: menu.sh:575 +#: menu.sh:625 msgid "Invalid MAC" msgstr "无效的MAC" -#: menu.sh:585 +#: menu.sh:635 msgid "Changing MAC" msgstr "修改MAC" -#: menu.sh:588 +#: menu.sh:638 msgid "Renewing IP" msgstr "刷新IP" -#: menu.sh:591 +#: menu.sh:641 msgid "Continue to custom MAC?" msgstr "继续自定义MAC?" -#: menu.sh:626 +#: menu.sh:676 msgid "Add/edit a synoinfo item" msgstr "添加/编辑Synoinfo参数" -#: menu.sh:627 +#: menu.sh:677 msgid "Delete synoinfo item(s)" msgstr "删除Synoinfo参数(s)" -#: menu.sh:628 +#: menu.sh:678 msgid "Show synoinfo entries" msgstr "显示Synoinfo参数" -#: menu.sh:639 menu.sh:645 menu.sh:656 menu.sh:664 menu.sh:681 +#: menu.sh:689 menu.sh:695 menu.sh:706 menu.sh:714 menu.sh:731 msgid "Synoinfo" msgstr "Synoinfo" -#: menu.sh:640 +#: menu.sh:690 msgid "Type a name of synoinfo entry" msgstr "输入参数的名称" -#: menu.sh:646 +#: menu.sh:696 msgid "Type a value of '%s' synoinfo entry" msgstr "输入 '%s' 参数的值" -#: menu.sh:657 +#: menu.sh:707 msgid "No synoinfo entries to remove" msgstr "没有Synoinfo参数被删除" -#: menu.sh:665 +#: menu.sh:715 msgid "Select synoinfo entry to remove" msgstr "选择要删除的参数" -#: menu.sh:704 +#: menu.sh:754 msgid "%s cached." msgstr "%s 已缓存." -#: menu.sh:708 +#: menu.sh:758 msgid "Cleaning cache" msgstr "清除缓存" -#: menu.sh:720 +#: menu.sh:770 msgid "" "Based on the current network situation, switch to %s mirror to downloading." msgstr "根据当前的网络状况, 已切换到 %s 镜像服务器进行下载." -#: menu.sh:725 +#: menu.sh:774 msgid "Downloading %s" msgstr "下载 %s 中" -#: menu.sh:736 menu.sh:798 +#: menu.sh:785 menu.sh:847 msgid "Check internet or cache disk space" msgstr "请检查internet或磁盘空间" -#: menu.sh:741 +#: menu.sh:790 msgid "Checking hash of %s: " msgstr "检查 %s 的 hash: " -#: menu.sh:744 +#: menu.sh:793 msgid "md5 Hash of pat not match, try again!" msgstr "pat 的 md5 Hash 不匹配, 请重试!" -#: menu.sh:748 menu.sh:850 menu.sh:860 +#: menu.sh:797 menu.sh:899 menu.sh:909 msgid "OK" msgstr "OK" -#: menu.sh:752 +#: menu.sh:801 msgid "Disassembling %s: " msgstr "解压 %s: " -#: menu.sh:757 +#: menu.sh:806 msgid "Uncompressed tar" msgstr "未压缩tar" -#: menu.sh:761 +#: menu.sh:810 msgid "Compressed tar" msgstr "压缩tar" -#: menu.sh:765 +#: menu.sh:814 msgid "Encrypted" msgstr "已加密" -#: menu.sh:770 +#: menu.sh:819 msgid "" "Could not determine if pat file is encrypted or not, maybe corrupted, try " "again!" msgstr "无法确定pat文件是否加密, 可能已损坏, 请重试!" -#: menu.sh:780 +#: menu.sh:829 msgid "Extractor cached." msgstr "已存在解密程序." -#: menu.sh:787 +#: menu.sh:836 msgid "Downloading old pat to extract synology .pat extractor..." msgstr "下载旧 pat, 提取 .pat 解密程序中..." -#: menu.sh:827 menu.sh:830 +#: menu.sh:876 menu.sh:879 msgid "Extracting..." msgstr "解压中..." -#: menu.sh:842 +#: menu.sh:891 msgid "pat Invalid, try again!" msgstr "无效的 pat, 请重试!" -#: menu.sh:845 +#: menu.sh:894 msgid "Setting hash: " msgstr "设置 hash: " -#: menu.sh:852 +#: menu.sh:901 msgid "Copying files: " msgstr "拷贝文件: " -#: menu.sh:875 +#: menu.sh:924 msgid "Addon %s not found!" msgstr "插件 %s 未找到!" -#: menu.sh:899 menu.sh:1764 +#: menu.sh:950 menu.sh:1834 msgid "Cleaning" msgstr "清除中" -#: menu.sh:902 +#: menu.sh:952 msgid "Ready!" msgstr "已就绪!" -#: menu.sh:915 +#: menu.sh:965 msgid "Switch LKM version:" msgstr "选择LKM版本:" -#: menu.sh:918 +#: menu.sh:968 msgid "Switch direct boot:" msgstr "切换直接启动:" -#: menu.sh:920 +#: menu.sh:970 msgid "boot IPs wait time:" msgstr "启动IPs等待时间:" -#: menu.sh:923 +#: menu.sh:973 msgid "Switch 'not set MACs':" msgstr "切换'不设置MACs':" -#: menu.sh:924 +#: menu.sh:974 msgid "Edit user config file manually" msgstr "编辑用户配置文件" -#: menu.sh:925 +#: menu.sh:975 msgid "Try to recovery a DSM installed system" msgstr "尝试恢复已安装DSM的系统" -#: menu.sh:926 +#: menu.sh:976 msgid "Show SATA(s) # ports and drives" msgstr "显示SATA(s) # 端口和驱动器" -#: menu.sh:928 -msgid "show pat download link" -msgstr "当前pat下载链接" +#: menu.sh:978 +msgid "show/modify the current pat data" +msgstr "显示/修改当前pat下载链接" -#: menu.sh:930 +#: menu.sh:980 msgid "Allow downgrade installation" msgstr "允许降级安装" -#: menu.sh:931 +#: menu.sh:981 msgid "Format disk(s) # Without loader disk" msgstr "格式化磁盘(s) # 不含启动盘" -#: menu.sh:932 +#: menu.sh:982 msgid "Reset syno system password" msgstr "重置群晖系统密码" -#: menu.sh:933 +#: menu.sh:983 msgid "Persistence of arpl modifications" msgstr "持久化arpl的修改" -#: menu.sh:935 +#: menu.sh:985 msgid "Custom dts file # Need rebuild" msgstr "自定义 dts 文件 # 需要重新编译" -#: menu.sh:938 +#: menu.sh:988 msgid "Backup bootloader disk # test" msgstr "备份启动盘 # 测试" -#: menu.sh:939 +#: menu.sh:989 msgid "Restore bootloader disk # test" msgstr "恢复启动盘 # 测试" -#: menu.sh:941 +#: menu.sh:991 msgid "Development tools" msgstr "开发者工具" -#: menu.sh:944 menu.sh:962 menu.sh:1022 menu.sh:1030 menu.sh:1038 menu.sh:1051 -#: menu.sh:1054 menu.sh:1069 menu.sh:1070 menu.sh:1075 menu.sh:1079 -#: menu.sh:1090 menu.sh:1092 menu.sh:1109 menu.sh:1114 menu.sh:1122 -#: menu.sh:1128 menu.sh:1141 menu.sh:1144 menu.sh:1150 menu.sh:1153 -#: menu.sh:1168 menu.sh:1173 menu.sh:1177 menu.sh:1192 menu.sh:1197 -#: menu.sh:1204 menu.sh:1208 menu.sh:1211 menu.sh:1216 menu.sh:1226 -#: menu.sh:1231 menu.sh:1237 menu.sh:1241 menu.sh:1258 menu.sh:1261 -#: menu.sh:1267 menu.sh:1275 menu.sh:1283 menu.sh:1292 menu.sh:1294 +#: menu.sh:994 menu.sh:1012 menu.sh:1072 menu.sh:1079 menu.sh:1097 menu.sh:1110 +#: menu.sh:1113 menu.sh:1128 menu.sh:1129 menu.sh:1134 menu.sh:1138 +#: menu.sh:1149 menu.sh:1151 menu.sh:1168 menu.sh:1173 menu.sh:1181 +#: menu.sh:1187 menu.sh:1200 menu.sh:1203 menu.sh:1209 menu.sh:1212 +#: menu.sh:1227 menu.sh:1232 menu.sh:1236 menu.sh:1251 menu.sh:1256 +#: menu.sh:1263 menu.sh:1267 menu.sh:1270 menu.sh:1275 menu.sh:1285 +#: menu.sh:1290 menu.sh:1296 menu.sh:1300 menu.sh:1317 menu.sh:1320 +#: menu.sh:1326 menu.sh:1334 menu.sh:1342 menu.sh:1351 menu.sh:1353 msgid "Advanced" msgstr "高级" -#: menu.sh:945 menu.sh:1718 +#: menu.sh:995 menu.sh:1788 msgid "Choose the option" msgstr "设置" -#: menu.sh:963 +#: menu.sh:1013 msgid "Choose a waiting time(seconds)" msgstr "选择一个等待时间(秒)" -#: menu.sh:1018 +#: menu.sh:1068 msgid "\\nTotal of ports: %s\\n" msgstr "\\n端口总数: %s\\n" -#: menu.sh:1019 +#: menu.sh:1069 msgid "" "\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive " "connected." msgstr "\\n\\Z1红色\\Zn 为模拟端口, \\Z2\\Zb绿色\\Zn 为已驱动的物理端口." -#: menu.sh:1020 +#: menu.sh:1070 msgid "\\nRecommended value:" msgstr "\\n建议值:" -#: menu.sh:1021 +#: menu.sh:1071 msgid "\\nDiskIdxMap:" msgstr "\\nDiskIdxMap:" -#: menu.sh:1035 +#: menu.sh:1078 +msgid "pat: (editable)" +msgstr "pat: (可编辑)" + +#: menu.sh:1094 msgid "" "This feature will allow you to downgrade the installation by removing the " "VERSION file from the first partition of all disks.\\n" msgstr "此功能通过删除所有磁盘的第一个分区的VERSION文件来允许你降级安装.\\n" -#: menu.sh:1036 +#: menu.sh:1095 msgid "Therefore, please insert all disks before continuing.\\n" msgstr "因此, 请插入所有磁盘后再进行操作.\\n" -#: menu.sh:1037 menu.sh:1076 +#: menu.sh:1096 menu.sh:1135 msgid "" "Warning:\\nThis operation is irreversible. Please backup important data. Do " "you want to continue?" msgstr "警告:\\n该操作不可逆, 请提前备份重要数据. 是否继续?" -#: menu.sh:1052 +#: menu.sh:1111 msgid "Removing ..." msgstr "删除中..." -#: menu.sh:1053 +#: menu.sh:1112 msgid "Remove VERSION file for all disks completed." msgstr "已移除所有磁盘的 VERSION 文件." -#: menu.sh:1080 +#: menu.sh:1139 msgid "" "Warning:\\nThe current hds is in raid, do you still want to format them?" msgstr "警告:\\n当前的硬盘处于raid中，是否仍要格式化?" -#: menu.sh:1091 +#: menu.sh:1150 msgid "Formatting ..." msgstr "格式化中..." -#: menu.sh:1093 +#: menu.sh:1152 msgid "Formatting is complete." msgstr "格式化完成." -#: menu.sh:1110 +#: menu.sh:1169 msgid "The installed Syno system not found in the currently inserted disks!" msgstr "未在当前插入的硬盘中找到已安装的syno系统!" -#: menu.sh:1115 +#: menu.sh:1174 msgid "Choose a user name" msgstr "选择一个用户" -#: menu.sh:1123 +#: menu.sh:1182 msgid "Type a new password for user '%s'" msgstr "输入用户 '%s' 的新密码" -#: menu.sh:1129 +#: menu.sh:1188 msgid "Invalid password" msgstr "无效密码" -#: menu.sh:1142 +#: menu.sh:1201 msgid "Resetting ..." msgstr "重置中" -#: menu.sh:1145 +#: menu.sh:1204 msgid "Password reset completed." msgstr "重置密码完成." -#: menu.sh:1151 menu.sh:1209 menu.sh:1262 +#: menu.sh:1210 menu.sh:1268 menu.sh:1321 msgid "" "Warning:\\nDo not terminate midway, otherwise it may cause damage to the " "arpl. Do you want to continue?" msgstr "警告:\\n请不要中途停止, 否则将导致arpl引导损毁, 是否继续?" -#: menu.sh:1154 +#: menu.sh:1213 msgid "Persisting ..." msgstr "持久化中..." -#: menu.sh:1169 +#: menu.sh:1228 msgid "Persisting is complete." msgstr "持久化完成." -#: menu.sh:1178 +#: menu.sh:1237 msgid "" "Currently, only dts format files are supported. Please prepare and click to " "confirm uploading.\\n(saved in /mnt/p3/users/)" msgstr "目前, 只支持dts格式的文件, 请准备并点击确认上传.\\n(保存于 /mnt/p3/users/ 中)" -#: menu.sh:1193 +#: menu.sh:1252 msgid "Not a valid dts file, please try again!" msgstr "dts 文件无效, 请重试!" -#: menu.sh:1198 +#: menu.sh:1257 msgid "A valid dts file, Automatically import at compile time." msgstr "dts 文件有效, 将在编译时自动导入." -#: menu.sh:1212 +#: menu.sh:1271 msgid "Backuping..." msgstr "备份中..." -#: menu.sh:1217 +#: menu.sh:1276 msgid "" "Failed to generate backup. There may be insufficient memory. Please clear " "the cache and try again!" msgstr "生成备份失败, 可能内存不足, 请清除缓存重试!" -#: menu.sh:1224 +#: menu.sh:1283 msgid "Click on the address above to download." msgstr "点击上面的地址下载." -#: menu.sh:1225 +#: menu.sh:1284 msgid "" "Please confirm the completion of the download before closing this window." msgstr "请确认下载完成再关闭此窗口." -#: menu.sh:1232 +#: menu.sh:1291 msgid "backup is complete." msgstr "备份完成." -#: menu.sh:1242 +#: menu.sh:1301 msgid "" "Please upload the backup file.\\nCurrently, zip(github) and img.gz(backup) " "compressed file formats are supported." msgstr "请上传备份的文件\\n当前支持 zip(github) 和 img.gz(backup) 格式." -#: menu.sh:1259 +#: menu.sh:1318 msgid "Not a valid .zip/.img.gz file, please try again!" msgstr "不是有效的.zip/.img.gz文件, 请重试!" -#: menu.sh:1268 +#: menu.sh:1327 msgid "Writing..." msgstr "写入中..." -#: menu.sh:1276 +#: menu.sh:1335 msgid "Restore bootloader disk with success to %s!\\nReboot?" msgstr "成功恢复启动盘到 %s!\\n重启?" -#: menu.sh:1284 +#: menu.sh:1343 msgid "" "This option only installs opkg package management, allowing you to install " "more tools for use and debugging. Do you want to continue?" msgstr "该选项仅安装 opkg 包管理工具, 使你能够安装更多的工具以供使用和调试, 是否继续?" -#: menu.sh:1293 +#: menu.sh:1352 msgid "opkg installing ..." msgstr "opkg 安装中 ..." -#: menu.sh:1295 +#: menu.sh:1354 msgid "" "opkg install is complete. Please reconnect to SSH/web, or execute 'source ~/." "bashrc'" msgstr "opkg 安装完成. 请重新链接 SSH/web, 或者执行 'source ~/.bashrc'" -#: menu.sh:1305 menu.sh:1333 menu.sh:1340 +#: menu.sh:1364 menu.sh:1401 menu.sh:1408 msgid "Try recovery DSM" msgstr "尝试恢复DSM系统" -#: menu.sh:1306 +#: menu.sh:1365 msgid "Trying to recovery a DSM installed system" msgstr "尝试恢复已安装的DSM系统中" -#: menu.sh:1327 -msgid "Found a installation:\\nModel: %s\\nBuildnumber: %s" +#: menu.sh:1391 +msgid "Found a installation:\\nModel: %s\\nProductversion: %s" msgstr "找到已安装:\\n型号: %s\\n版本: %s" -#: menu.sh:1331 +#: menu.sh:1395 msgid "\\nSerial: %s" msgstr "\\nSN: %s" -#: menu.sh:1341 +#: menu.sh:1409 msgid "Unfortunately I couldn't mount the DSM partition!" msgstr "很遗憾, 我无法挂载DSM分区!" -#: menu.sh:1349 menu.sh:1355 +#: menu.sh:1417 menu.sh:1423 msgid "Edit with caution" msgstr "请谨慎编辑" -#: menu.sh:1375 +#: menu.sh:1445 msgid "Alert" msgstr "警告" -#: menu.sh:1376 +#: menu.sh:1446 msgid "Config changed, would you like to rebuild the loader?" msgstr "配置已更改, 是否重新编译引导?" -#: menu.sh:1388 menu.sh:1709 +#: menu.sh:1458 menu.sh:1779 msgid "Choose a language" msgstr "选择语言" -#: menu.sh:1402 +#: menu.sh:1472 msgid "Choose a layout" msgstr "选择布局" -#: menu.sh:1414 +#: menu.sh:1484 msgid "Choice a keymap" msgstr "选择键盘" -#: menu.sh:1432 menu.sh:1465 menu.sh:1516 menu.sh:1572 menu.sh:1580 -#: menu.sh:1588 menu.sh:1596 +#: menu.sh:1502 menu.sh:1535 menu.sh:1586 menu.sh:1642 menu.sh:1650 +#: menu.sh:1658 menu.sh:1666 msgid "Update %s" msgstr "更新 %s" -#: menu.sh:1435 +#: menu.sh:1505 msgid "Checking last version" msgstr "检测新版本中" -#: menu.sh:1443 +#: menu.sh:1513 msgid "Error checking new version" msgstr "检测新版本错误" -#: menu.sh:1448 +#: menu.sh:1518 msgid "No new version. Actual version is %s\\nForce update?" msgstr "没有新版本. 实际版本为 %s\\n强制更新?" -#: menu.sh:1452 +#: menu.sh:1522 msgid "Downloading last version" msgstr "下载新版本中" -#: menu.sh:1457 +#: menu.sh:1527 msgid "Error downloading new version" msgstr "下载新版本错误" -#: menu.sh:1467 menu.sh:1518 +#: menu.sh:1537 menu.sh:1588 msgid "Extracting last version" msgstr "解压新版本" -#: menu.sh:1471 +#: menu.sh:1541 msgid "Error extracting update file" msgstr "更新文件解压错误" -#: menu.sh:1478 +#: menu.sh:1548 msgid "Checksum do not match!" msgstr "Checksum不匹配!" -#: menu.sh:1487 +#: menu.sh:1557 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "当前版本不支持最新的update.zip升级, 请重新制作引导盘!" -#: menu.sh:1492 +#: menu.sh:1562 msgid "Installing new files" msgstr "安装更新中" -#: menu.sh:1509 +#: menu.sh:1579 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "Arpl更新成功 %s!\\n重启?" -#: menu.sh:1524 +#: menu.sh:1594 msgid "Installing new %s" msgstr "安装新 %s 中" -#: menu.sh:1549 +#: menu.sh:1621 msgid "%s updated with success!" msgstr "%s 更新成功!" -#: menu.sh:1561 +#: menu.sh:1631 msgid "Update arpl" msgstr "更新arpl" -#: menu.sh:1562 +#: menu.sh:1632 msgid "Update addons" msgstr "更新插件" -#: menu.sh:1563 +#: menu.sh:1633 msgid "Update modules" msgstr "更新模块" -#: menu.sh:1564 +#: menu.sh:1634 msgid "Update LKMs" msgstr "更新LKMs" -#: menu.sh:1565 +#: menu.sh:1635 msgid "Set proxy server" msgstr "设置代理" -#: menu.sh:1566 +#: menu.sh:1636 msgid "Local upload" msgstr "本地上传" -#: menu.sh:1572 +#: menu.sh:1642 msgid "arpl" msgstr "arpl" -#: menu.sh:1580 +#: menu.sh:1650 msgid "addons" msgstr "插件" -#: menu.sh:1588 +#: menu.sh:1658 msgid "modules" msgstr "模块" -#: menu.sh:1596 +#: menu.sh:1666 msgid "LKMs" msgstr "LKMs" -#: menu.sh:1606 menu.sh:1617 menu.sh:1628 menu.sh:1638 menu.sh:1655 -#: menu.sh:1669 +#: menu.sh:1676 menu.sh:1687 menu.sh:1698 menu.sh:1708 menu.sh:1725 +#: menu.sh:1739 msgid "Update" msgstr "更新" -#: menu.sh:1607 +#: menu.sh:1677 msgid "Please enter a proxy server url" msgstr "请输入代理服务器url" -#: menu.sh:1618 +#: menu.sh:1688 msgid "Invalid proxy server url, continue?" msgstr "无效的代理服务器url,是否继续?" -#: menu.sh:1633 +#: menu.sh:1703 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "请保持附件名称与 github 上附件名称一致.\\n" -#: menu.sh:1634 +#: menu.sh:1704 msgid "Upload update.zip will update arpl.\\n" msgstr "上传 update.zip 将更新 arpl.\\n" -#: menu.sh:1635 +#: menu.sh:1705 msgid "Upload addons.zip will update Addons.\\n" msgstr "上传 addons.zip 将更新 插件.\\n" -#: menu.sh:1636 +#: menu.sh:1706 msgid "Upload modules.zip will update Modules.\\n" msgstr "上传 modules.zip 将更新 模块.\\n" -#: menu.sh:1637 +#: menu.sh:1707 msgid "Upload rp-lkms.zip will update LKMs.\\n" msgstr "上传 rp-lkms.zip 将更新 LKMs.\\n" -#: menu.sh:1690 +#: menu.sh:1760 msgid "Choose a model" msgstr "选择型号" -#: menu.sh:1692 -msgid "Choose a Build Number" +#: menu.sh:1762 +msgid "Choose a product version" msgstr "选择版本" -#: menu.sh:1696 +#: menu.sh:1766 msgid "Cmdline menu" msgstr "设置Cmdline" -#: menu.sh:1697 +#: menu.sh:1767 msgid "Synoinfo menu" msgstr "设置Synoinfo" -#: menu.sh:1700 +#: menu.sh:1770 msgid "Advanced menu" msgstr "高级设置" -#: menu.sh:1703 +#: menu.sh:1773 msgid "Build the loader" msgstr "编译引导" -#: menu.sh:1707 +#: menu.sh:1777 msgid "Boot the loader" msgstr "启动" -#: menu.sh:1710 +#: menu.sh:1780 msgid "Choose a keymap" msgstr "选择键盘" -#: menu.sh:1712 +#: menu.sh:1782 msgid "Clean disk cache" msgstr "清除磁盘缓存" -#: menu.sh:1714 +#: menu.sh:1784 msgid "Update menu" msgstr "更新" -#: menu.sh:1776 +#: menu.sh:1846 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "执行 \\033[1;32mmenu.sh\\033[0m 重新进入设置菜单" diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index fdc8c423..078ec032 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -21,7 +21,9 @@ DIRTY=0 # DEBUG=0 MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" -BUILD="$(readConfigKey "build" "${USER_CONFIG_FILE}")" +PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" +BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")" +SMALLNUM="$(readConfigKey "smallnum" "${USER_CONFIG_FILE}")" LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")" KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")" LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")" @@ -39,10 +41,15 @@ function backtitle() { else BACKTITLE+=" (no model)" fi - if [ -n "${BUILD}" ]; then - BACKTITLE+=" ${BUILD}" + if [ -n "${PRODUCTVER}" ]; then + BACKTITLE+=" ${PRODUCTVER}" + if [ -n "${BUILDNUM}" ]; then + BACKTITLE+="(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))" + else + BACKTITLE+="(no build)" + fi else - BACKTITLE+=" (no build)" + BACKTITLE+=" (no productver)" fi if [ -n "${SN}" ]; then BACKTITLE+=" ${SN}" @@ -120,25 +127,28 @@ function modelMenu() { else resp="${1}" fi - # If user change model, clean buildnumber and S/N + # If user change model, clean build* and pat* and SN if [ "${MODEL}" != "${resp}" ]; then MODEL=${resp} writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}" - BUILD="" - writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}" + PRODUCTVER="" + BUILDNUM="" + SMALLNUM="" + writeConfigKey "productver" "" "${USER_CONFIG_FILE}" + writeConfigKey "buildnum" "" "${USER_CONFIG_FILE}" + writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}" + writeConfigKey "paturl" "" "${USER_CONFIG_FILE}" + writeConfigKey "patsum" "" "${USER_CONFIG_FILE}" SN=$(generateSerial "${MODEL}") writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}" - # Delete old files - rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" - rm -f "${TMP_PATH}/patdownloadurl" DIRTY=1 fi } ############################################################################### # Shows available buildnumbers from a model to user choose one -function buildMenu() { - ITEMS="$(readConfigEntriesArray "builds" "${MODEL_CONFIG_PATH}/${MODEL}.yml" | sort -r)" +function productversMenu() { + ITEMS="$(readConfigEntriesArray "productvers" "${MODEL_CONFIG_PATH}/${MODEL}.yml" | sort -r)" if [ -z "${1}" ]; then dialog --backtitle "$(backtitle)" --colors \ --no-items --menu "$(TEXT "Choose a build number")" 0 0 0 ${ITEMS} \ @@ -150,30 +160,69 @@ function buildMenu() { if ! arrayExistItem "${1}" ${ITEMS}; then return; fi resp="${1}" fi - if [ "${BUILD}" != "${resp}" ]; then - local KVER=$(readModelKey "${MODEL}" "builds.${resp}.kver") + if [ "${PRODUCTVER}" != "${resp}" ]; then + local KVER=$(readModelKey "${MODEL}" "productvers.[${resp}].kver") if [ -d "/sys/firmware/efi" -a "${KVER:0:1}" = "3" ]; then dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Build Number")" \ --msgbox "$(TEXT "This version does not support UEFI startup, Please select another version or switch the startup mode.")" 0 0 - buildMenu + return fi if [ ! "usb" = "$(udevadm info --query property --name ${LOADER_DISK} | grep BUS | cut -d= -f2)" -a "${KVER:0:1}" = "5" ]; then dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Build Number")" \ --msgbox "$(TEXT "This version only support usb startup, Please select another version or switch the startup mode.")" 0 0 - buildMenu + return + fi + # get online pat data + dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Build Number")" \ + --infobox "$(TEXT "Get online pat data ..")" 0 0 + idx=1 + while [ $idx -le 3 ]; do # Loop 3 times, if successful, break + speed_a=$(ping -c 1 -W 5 www.synology.com | awk '/time=/ {print $7}' | cut -d '=' -f 2) + speed_b=$(ping -c 1 -W 5 www.synology.cn | awk '/time=/ {print $7}' | cut -d '=' -f 2) + fastest="$(echo -e "https://www.synology.com/api/support/findDownloadInfo?lang=en-us ${speed_a:-999}\nhttps://www.synology.cn/api/support/findDownloadInfo?lang=zh-cn ${speed_b:-999}" | sort -k2n | head -1 | awk '{print $1}')" + patdata=$(curl -skL "${fastest}&product=${MODEL/+/%2B}&major=${resp%%.*}&minor=${resp##*.}") + if [ "$(echo ${patdata} | jq -r '.success' 2>/dev/null)" = "true" ]; then + if echo ${patdata} | jq -r '.info.system.detail[0].items[0].files[0].label_ext' 2>/dev/null | grep -q 'pat'; then + paturl=$(echo ${patdata} | jq -r '.info.system.detail[0].items[0].files[0].url') + patsum=$(echo ${patdata} | jq -r '.info.system.detail[0].items[0].files[0].checksum') + paturl=${paturl%%\?*} + break + fi + fi + idx=$((idx + 1)) + done + if [ -z "${paturl}" -o -z "${patsum}" ]; then + MSG="Failed to get online pat data,\nPlease manually fill in the URL and md5sum of the corresponding version of pat." + paturl="" + patsum="" + else + MSG="Successfully to get online pat data,\nPlease confirm or modify as needed." fi + dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Build Number")" \ + --form "${MSG}" 10 110 2 "URL" 1 1 "${paturl}" 1 5 100 0 "MD5" 2 1 "${patsum}" 2 5 100 0 \ + 2>"${TMP_PATH}/resp" + [ $? -ne 0 ] && return + [ -z "${paturl}" -o -z "${patsum}" ] && return + paturl="$(cat "${TMP_PATH}/resp" | tail -n +1 | head -1)" + patsum="$(cat "${TMP_PATH}/resp" | tail -n +2 | head -1)" + writeConfigKey "paturl" "${paturl}" "${USER_CONFIG_FILE}" + writeConfigKey "patsum" "${patsum}" "${USER_CONFIG_FILE}" + PRODUCTVER=${resp} + writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}" + BUILDNUM="" + SMALLNUM="" + writeConfigKey "buildnum" "" "${USER_CONFIG_FILE}" + writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Build Number")" \ --infobox "$(TEXT "Reconfiguring Synoinfo, Addons and Modules")" 0 0 - BUILD=${resp} - writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}" # Delete synoinfo and reload model/build synoinfo writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}" while IFS=': ' read KEY VALUE; do writeConfigKey "synoinfo.${KEY}" "${VALUE}" "${USER_CONFIG_FILE}" - done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo") + done < <(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].synoinfo") # Check addons PLATFORM="$(readModelKey "${MODEL}" "platform")" - KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")" + KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" while IFS=': ' read ADDON PARAM; do [ -z "${ADDON}" ] && continue if ! checkAddonExist "${ADDON}" "${PLATFORM}" "${KVER}"; then @@ -187,7 +236,6 @@ function buildMenu() { done < <(getAllModules "${PLATFORM}" "${KVER}") # Remove old files rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" - rm -f "${TMP_PATH}/patdownloadurl" DIRTY=1 fi } @@ -197,7 +245,7 @@ function buildMenu() { function addonMenu() { # Read 'platform' and kernel version to check if addon exists PLATFORM="$(readModelKey "${MODEL}" "platform")" - KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")" + KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" # Read addons from user config unset ADDONS declare -A ADDONS @@ -338,7 +386,7 @@ function addonMenu() { ############################################################################### function moduleMenu() { PLATFORM="$(readModelKey "${MODEL}" "platform")" - KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")" + KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ --infobox "$(TEXT "Reading modules")" 0 0 ALLMODULES=$(getAllModules "${PLATFORM}" "${KVER}") @@ -607,7 +655,7 @@ function cmdlineMenu() { ITEMS="" while IFS=': ' read KEY VALUE; do ITEMS+="${KEY}: ${VALUE}\n" - done < <(readModelMap "${MODEL}" "builds.${BUILD}.cmdline") + done < <(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].cmdline") dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ --msgbox "${ITEMS}" 0 0 ;; @@ -691,16 +739,16 @@ function synoinfoMenu() { ############################################################################### # Extract linux and ramdisk files from the DSM .pat function extractDsmFiles() { - PAT_URL="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.url")" - PAT_MD5="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.md5")" + PATURL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")" + PATSUM="$(readConfigKey "patsum" "${USER_CONFIG_FILE}")" SPACELEFT=$(df --block-size=1 | awk '/'${LOADER_DEVICE_NAME}'3/{print $4}') # Check disk space left - PAT_FILE="${MODEL}-${BUILD}.pat" + PAT_FILE="${MODEL}-${PRODUCTVER}.pat" PAT_PATH="${CACHE_PATH}/dl/${PAT_FILE}" EXTRACTOR_PATH="${CACHE_PATH}/extractor" EXTRACTOR_BIN="syno_extract_system_patch" - OLDPAT_URL="https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat" + OLDPATURL="https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat" if [ -f "${PAT_PATH}" ]; then echo "$(printf "$(TEXT "%s cached.")" "${PAT_FILE}")" @@ -717,21 +765,20 @@ function extractDsmFiles() { speed_c=$(ping -c 1 -W 5 cndl.synology.cn | awk '/time=/ {print $7}' | cut -d '=' -f 2) fastest="$(echo -e "global.synologydownload.com ${speed_a:-999}\nglobal.download.synology.com ${speed_b:-999}\ncndl.synology.cn ${speed_c:-999}" | sort -k2n | head -1 | awk '{print $1}')" - mirror="$(echo ${PAT_URL} | sed 's|^http[s]*://\([^/]*\).*|\1|')" + mirror="$(echo ${PATURL} | sed 's|^http[s]*://\([^/]*\).*|\1|')" if [ "${mirror}" != "${fastest}" ]; then echo "$(printf "$(TEXT "Based on the current network situation, switch to %s mirror to downloading.")" "${fastest}")" - PAT_URL="$(echo ${PAT_URL} | sed "s/${mirror}/${fastest}/")" - OLDPAT_URL="https://${fastest}/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat" + PATURL="$(echo ${PATURL} | sed "s/${mirror}/${fastest}/")" + OLDPATURL="https://${fastest}/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat" fi - echo ${PAT_URL} >"${TMP_PATH}/patdownloadurl" echo "$(printf "$(TEXT "Downloading %s")" "${PAT_FILE}")" # Discover remote file size - FILESIZE=$(curl -k -sLI "${PAT_URL}" | grep -i Content-Length | awk '{print$2}') + FILESIZE=$(curl -k -sLI "${PATURL}" | grep -i Content-Length | awk '{print$2}') if [ 0${FILESIZE} -ge 0${SPACELEFT} ]; then # No disk space to download, change it to RAMDISK PAT_PATH="${TMP_PATH}/${PAT_FILE}" fi - STATUS=$(curl -k -w "%{http_code}" -L "${PAT_URL}" -o "${PAT_PATH}" --progress-bar) + STATUS=$(curl -k -w "%{http_code}" -L "${PATURL}" -o "${PAT_PATH}" --progress-bar) if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then rm "${PAT_PATH}" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ @@ -741,7 +788,7 @@ function extractDsmFiles() { fi echo -n "$(printf "$(TEXT "Checking hash of %s: ")" "${PAT_FILE}")" - if [ "$(md5sum ${PAT_PATH} | awk '{print $1}')" != "${PAT_MD5}" ]; then + if [ "$(md5sum ${PAT_PATH} | awk '{print $1}')" != "${PATSUM}" ]; then dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ --msgbox "$(TEXT "md5 Hash of pat not match, try again!")" 0 0 rm -f ${PAT_PATH} @@ -788,12 +835,12 @@ function extractDsmFiles() { if [ ! -f "${OLDPAT_PATH}" ]; then echo "$(TEXT "Downloading old pat to extract synology .pat extractor...")" # Discover remote file size - FILESIZE=$(curl -k -sLI "${OLDPAT_URL}" | grep -i Content-Length | awk '{print$2}') + FILESIZE=$(curl -k -sLI "${OLDPATURL}" | grep -i Content-Length | awk '{print$2}') if [ 0${FILESIZE} -ge 0${SPACELEFT} ]; then # No disk space to download, change it to RAMDISK OLDPAT_PATH="${TMP_PATH}/DS3622xs+-42218.pat" fi - STATUS=$(curl -k -w "%{http_code}" -L "${OLDPAT_URL}" -o "${OLDPAT_PATH}" --progress-bar) + STATUS=$(curl -k -w "%{http_code}" -L "${OLDPATURL}" -o "${OLDPAT_PATH}" --progress-bar) if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then rm "${OLDPAT_PATH}" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ @@ -867,7 +914,7 @@ function extractDsmFiles() { function make() { clear PLATFORM="$(readModelKey "${MODEL}" "platform")" - KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")" + KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" # Check if all addon exists while IFS=': ' read ADDON PARAM; do @@ -897,10 +944,11 @@ function make() { --msgbox "$(TEXT "Ramdisk not patched:\n")$(<"${LOG_FILE}")" 0 0 return 1 fi - + PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" + BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")" + SMALLNUM="$(readConfigKey "smallnum" "${USER_CONFIG_FILE}")" echo "$(TEXT "Cleaning")" rm -rf "${UNTAR_PAT_PATH}" - echo "$(TEXT "Ready!")" sleep 3 DIRTY=0 @@ -913,7 +961,7 @@ function advancedMenu() { NEXT="l" while true; do rm "${TMP_PATH}/menu" - if [ -n "${BUILD}" ]; then + if [ -n "${PRODUCTVER}" ]; then echo "l \"$(TEXT "Switch LKM version:") \Z4${LKM}\Zn\"" >>"${TMP_PATH}/menu" fi if loaderIsConfigured; then @@ -926,8 +974,8 @@ function advancedMenu() { echo "u \"$(TEXT "Edit user config file manually")\"" >>"${TMP_PATH}/menu" echo "t \"$(TEXT "Try to recovery a DSM installed system")\"" >>"${TMP_PATH}/menu" echo "s \"$(TEXT "Show SATA(s) # ports and drives")\"" >>"${TMP_PATH}/menu" - if [ -n "${MODEL}" -a -n "${BUILD}" ]; then - echo "k \"$(TEXT "show pat download link")\"" >>"${TMP_PATH}/menu" + if [ -n "${MODEL}" -a -n "${PRODUCTVER}" ]; then + echo "k \"$(TEXT "show/modify the current pat data")\"" >>"${TMP_PATH}/menu" fi echo "a \"$(TEXT "Allow downgrade installation")\"" >>"${TMP_PATH}/menu" echo "f \"$(TEXT "Format disk(s) # Without loader disk")\"" >>"${TMP_PATH}/menu" @@ -1025,12 +1073,21 @@ function advancedMenu() { --msgbox "${MSG}" 0 0 ;; k) - # output pat download link - if [ ! -f "${TMP_PATH}/patdownloadurl" ]; then - echo "$(readModelKey "${MODEL}" "builds.${BUILD}.pat.url")" >"${TMP_PATH}/patdownloadurl" - fi + PATURL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")" + PATSUM="$(readConfigKey "patsum" "${USER_CONFIG_FILE}")" + MSG="$(TEXT "pat: (editable)")" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ - --editbox "${TMP_PATH}/patdownloadurl" 10 100 + --form "${MSG}" 10 110 2 "URL" 1 1 "${PATURL}" 1 5 100 0 "MD5" 2 1 "${PATSUM}" 2 5 100 0 \ + 2>"${TMP_PATH}/resp" + [ $? -ne 0 ] && return + paturl="$(cat "${TMP_PATH}/resp" | tail -n +1 | head -1)" + patsum="$(cat "${TMP_PATH}/resp" | tail -n +2 | head -1)" + if [ ! ${paturl} = ${PATURL} ] || [ ! ${patsum} = ${PATSUM} ]; then + writeConfigKey "paturl" "${paturl}" "${USER_CONFIG_FILE}" + writeConfigKey "patsum" "${patsum}" "${USER_CONFIG_FILE}" + rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" + DIRTY=1 + fi ;; a) MSG="" @@ -1308,10 +1365,15 @@ function tryRecoveryDSM() { --infobox "$(TEXT "Trying to recovery a DSM installed system")" 0 0 if findAndMountDSMRoot; then MODEL="" - BUILD="" + PRODUCTVER="" + BUILDNUM="" + SMALLNUM="" if [ -f "${DSMROOT_PATH}/.syno/patch/VERSION" ]; then eval $(cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep unique) - eval $(cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep base) + eval $(cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep majorversion) + eval $(cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep minorversion) + eval $(cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep buildnumber) + eval $(cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep smallfixnumber) if [ -n "${unique}" ]; then while read F; do M="$(basename ${F})" @@ -1322,16 +1384,20 @@ function tryRecoveryDSM() { modelMenu "${M}" done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) if [ -n "${MODEL}" ]; then - buildMenu ${base} - if [ -n "${BUILD}" ]; then + productversMenu "${majorversion}.${minorversion}" + if [ -n "${PRODUCTVER}" ]; then cp "${DSMROOT_PATH}/.syno/patch/zImage" "${SLPART_PATH}" cp "${DSMROOT_PATH}/.syno/patch/rd.gz" "${SLPART_PATH}" - MSG="$(printf "$(TEXT "Found a installation:\nModel: %s\nBuildnumber: %s")" "${MODEL}" "${BUILD}")" + MSG="$(printf "$(TEXT "Found a installation:\nModel: %s\nProductversion: %s")" "${MODEL}" "${PRODUCTVER}")" SN=$(_get_conf_kv SN "${DSMROOT_PATH}/etc/synoinfo.conf") if [ -n "${SN}" ]; then writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}" MSG+="$(printf "$(TEXT "\nSerial: %s")" "${SN}")" fi + BUILDNUM=${buildnumber} + SMALLNUM=${smallfixnumber} + writeConfigKey "buildnum" "${BUILDNUM}" "${USER_CONFIG_FILE}" + writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Try recovery DSM")" \ --msgbox "${MSG}" 0 0 fi @@ -1358,12 +1424,14 @@ function editUserConfig() { --msgbox "${ERRORS}" 0 0 done OLDMODEL=${MODEL} - OLDBUILD=${BUILD} + OLDPRODUCTVER=${PRODUCTVER} + OLDBUILDNUM=${BUILDNUM} MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" - BUILD="$(readConfigKey "build" "${USER_CONFIG_FILE}")" + PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" + BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")" SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")" - if [ "${MODEL}" != "${OLDMODEL}" -o "${BUILD}" != "${OLDBUILD}" ]; then + if [ "${MODEL}" != "${OLDMODEL}" -o "${PRODUCTVER}" != "${OLDPRODUCTVER}" -o "${BUILDNUM}" != "${OLDBUILDNUM}" ]; then # Remove old files rm -f "${MOD_ZIMAGE_FILE}" rm -f "${MOD_RDGZ_FILE}" @@ -1536,6 +1604,8 @@ function updateExts() { rm "${MODULES_PATH}/"* unzip /tmp/modules.zip -d "${MODULES_PATH}" >/dev/null 2>&1 # Rebuild modules if model/buildnumber is selected + PLATFORM="$(readModelKey "${MODEL}" "platform")" + KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" if [ -n "${PLATFORM}" -a -n "${KVER}" ]; then writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" while read ID DESC; do @@ -1553,8 +1623,6 @@ function updateExts() { ############################################################################### function updateMenu() { - PLATFORM="$(readModelKey "${MODEL}" "platform")" - KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")" PROXY="$(readConfigKey "proxy" "${USER_CONFIG_FILE}")" [ -n "${PROXY}" ] && [[ "${PROXY: -1}" != "/" ]] && PROXY="${PROXY}/" while true; do @@ -1681,7 +1749,7 @@ function updateMenu() { ############################################################################### ############################################################################### -if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${BUILD}" -a loaderIsConfigured ]; then +if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${PRODUCTVER}" -a loaderIsConfigured ]; then install-addons.sh make boot && exit 0 || sleep 5 @@ -1691,8 +1759,8 @@ NEXT="m" while true; do echo "m \"$(TEXT "Choose a model")\"" >"${TMP_PATH}/menu" if [ -n "${MODEL}" ]; then - echo "n \"$(TEXT "Choose a Build Number")\"" >>"${TMP_PATH}/menu" - if [ -n "${BUILD}" ]; then + echo "n \"$(TEXT "Choose a product version")\"" >>"${TMP_PATH}/menu" + if [ -n "${PRODUCTVER}" ]; then echo "a \"$(TEXT "Addons")\"" >>"${TMP_PATH}/menu" echo "o \"$(TEXT "Modules")\"" >>"${TMP_PATH}/menu" echo "x \"$(TEXT "Cmdline menu")\"" >>"${TMP_PATH}/menu" @@ -1701,7 +1769,7 @@ while true; do fi echo "v \"$(TEXT "Advanced menu")\"" >>"${TMP_PATH}/menu" if [ -n "${MODEL}" ]; then - if [ -n "${BUILD}" ]; then + if [ -n "${PRODUCTVER}" ]; then echo "d \"$(TEXT "Build the loader")\"" >>"${TMP_PATH}/menu" fi fi @@ -1726,7 +1794,7 @@ while true; do NEXT="n" ;; n) - buildMenu + productversMenu NEXT="a" ;; a) diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml index 8357814b..ec01b39d 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml @@ -29,18 +29,14 @@ dom: 2 dt: false disks: 4 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1019%2B_25556.pat" - md5: "a5291a1d0f31518c09c616502e1433a6" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -48,17 +44,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1019%2B_42218.pat" - md5: "a7c5ac7a5963aac8bf9a599a8a6f6b86" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -66,35 +58,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1019%2B_42661.pat" - md5: "1318c234b08c06ad0a6b49a3d739fb95" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1019%2B_42962.pat" - md5: "b590bc9f0df784be4d6bae13d551f76b" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -102,17 +72,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1019%2B_64570.pat" - md5: "c1c9b295ca7f1434c0f1eeab4f989316" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml index dd28b376..a556ecd1 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml @@ -27,86 +27,53 @@ dom: 2 dt: true disks: 6 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1520%2B_25556.pat" - md5: "d14c87ddd7c76c4c4156692b4a2c57f7" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-25556-post-init-script.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat" - md5: "d1ebc3c9a2b9e04980a85c4784904f91" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat" - md5: "1d8ecfcb2a956488ae355c79a72bb9ec" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1520%2B_42962.pat" - md5: "d28994a9dcdae9730b4d1370a39d3130" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1520%2B_64570.pat" - md5: "5063db1ed248fb36074ce8d2aba645a9" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 44edfcdd..6219134b 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml @@ -28,86 +28,53 @@ dom: 2 dt: true disks: 6 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1621%2B_25556.pat" - md5: "e6be691eb7df063a59f3889ede1b43ce" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-25556-post-init-script.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1621%2B_42218.pat" - md5: "1fd1d6e733bb096f418f68e06f81022e" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1621%2B_42661.pat" - md5: "b4b72eb8d4e84b2e2a8c29fc0a1ac6aa" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1621%2B_42962.pat" - md5: "93a5a2b9515b39e18d0b48df84d5c007" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1621%2B_64570.pat" - md5: "6f9fa1ff5b9b2dded366b1a2d2687aea" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml index 679865bd..f7a8040f 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml @@ -27,18 +27,14 @@ dom: 1 dt: false disks: 6 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1621xs%2B_25556.pat" - md5: "980277a06f6ba645e8ae64121788beb7" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -46,17 +42,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1621xs%2B_42218.pat" - md5: "302fdefb00c8d4f8bf95ac25dca1e864" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -64,35 +56,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1621xs%2B_42661.pat" - md5: "18f849121a9a1918aca94c6774524910" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1621xs%2B_42962.pat" - md5: "fffec3510c954fc718a1aecba2f98fc6" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -100,17 +70,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1621xs%2B_64570.pat" - md5: "ff027f65c9712059a5a54bfbfb5a52b7" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml index 639d51ca..4dd75434 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml @@ -27,35 +27,27 @@ dom: 2 dt: true disks: 12 beta: true -builds: - 42962: - ver: "7.1.1" +productvers: + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS1823xs%2B_42962.pat" - md5: "1011932a1cfb8aa07e77beebede87a71" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1823xs%2B_64570.pat" - md5: "1a8a5e1d8461e9a3af638dae7f121ad3" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 d28c1da4..34bcdda8 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml @@ -28,69 +28,40 @@ dom: 2 dt: true disks: 12 beta: false -builds: - 42218: - ver: "7.0.1" +productvers: + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS2422%2B_42218.pat" - md5: "7fe3c9ae80396a2ea9ed9909b8746c4b" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat" - md5: "9ea5e0fe94c01072da36e2f69172abb3" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS2422%2B_42962.pat" - md5: "b00d3d1ccf1b1a6982b2b594420e0f3c" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS2422%2B_64570.pat" - md5: "3e5e09f4d4b0f09ab03f28d12b76f03a" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 2c7a3d9f..6f6edbc7 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml @@ -30,18 +30,14 @@ dom: 1 dt: false disks: 12 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "3.10.105" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS3615xs_25556.pat" - md5: "c166cbd39de4d4908e9ce36b93c19274" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -49,17 +45,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "3.10.108" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3615xs_42218.pat" - md5: "9f959ec4d16d5d7729374961fc2b9bed" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -67,35 +59,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "3.10.108" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3615xs_42661.pat" - md5: "271b34cb2a0c23d63178aef3bf45a6ae" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "3.10.108" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3615xs_42962.pat" - md5: "cb864a71a791f9a25939356053d25b30" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.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 a804e556..7a64f2ac 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml @@ -30,18 +30,14 @@ dom: 1 dt: false disks: 12 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "3.10.105" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS3617xs_25556.pat" - md5: "0cc513483fb3c82815ca7dd50fa52e4f" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -49,17 +45,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3617xs_42218.pat" - md5: "b7d85926561ff125928b68e7fffa646b" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -67,35 +59,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3617xs_42661.pat" - md5: "94e6263912bc758ee3db81c62a94a8f6" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3617xs_42962.pat" - md5: "b46e3d7933c7f77c78d536d33f9b5c4a" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -103,17 +73,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS3617xs_64570.pat" - md5: "4c6165e5c87d83d52a173679d320383f" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 98eae432..038a2245 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml @@ -30,18 +30,14 @@ dom: 1 dt: false disks: 12 beta: false -builds: - 42218: - ver: "7.0.1" +productvers: + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat" - md5: "b9b452577b38adc82aca42e031be267b" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -49,35 +45,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3622xs%2B_42661.pat" - md5: "7af76cca8226ecf95b25630bffa76b3d" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3622xs%2B_42962.pat" - md5: "d3b223e1e973fcf5c67c64e72775a576" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -85,17 +59,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS3622xs%2B_64570.pat" - md5: "456fc142cf8d3f1c329601c9d9ed66f5" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml index d11b9e07..aed65881 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml @@ -30,86 +30,53 @@ dom: 2 dt: true disks: 4 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS720%2B_25556.pat" - md5: "ae36c9277e076f5b6989532deac5feb0" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-25556-post-init-script.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS720%2B_42218.pat" - md5: "83dd377fa9d66f21e2ab2536bb9a3943" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS720%2B_42661.pat" - md5: "c811400d228502f37370b527b5624967" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS720%2B_42962.pat" - md5: "9ecc37490cb6e4de3af666db5766cb21" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS720%2B_64570.pat" - md5: "6ff89c899fa9ef0e546a45bc8a5d1b50" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml index b239ff9e..55fbbea2 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml @@ -26,35 +26,27 @@ dom: 2 dt: true disks: 2 beta: true -builds: - 42962: - ver: "7.1.1" +productvers: + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS723%2B_42962.pat" - md5: "e8e6598014205a9cfb98c95183e856fe" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS723%2B_64570.pat" - md5: "302f4427cc76bc3830afc5cff1424298" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled index 5e7ee9be..2f309119 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled @@ -28,18 +28,14 @@ dom: 2 dt: false disks: 4 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "3.10.105" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS916%2B_25556.pat" - md5: "03b17f09626d77a3f99078380c930597" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -47,17 +43,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "3.10.108" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS916%2B_42218.pat" - md5: "ed7c45bef0e8a19ae4d1451745d87959" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -65,35 +57,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "3.10.108" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS916%2B_42661.pat" - md5: "d1f7e79208d48731af49b2ca6e117542" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "3.10.108" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS916%2B_42962.pat" - md5: "19bf342e86c825e1a676c5a7a86b353d" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -101,17 +71,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "3.10.108" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS916%2B_64570.pat" - md5: "32aa3791b7b4bbdf4b0fe8849e59202d" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 d02abb80..f6b9c50e 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml @@ -32,18 +32,14 @@ dom: 2 dt: false disks: 4 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS918%2B_25556.pat" - md5: "e44e9590f23a1a6b593d40db182269c5" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -51,17 +47,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS918%2B_42218.pat" - md5: "0c8a0d2dc6f1d7e37ee63d74760808b8" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -69,35 +61,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS918%2B_42661.pat" - md5: "2c49260d2646a0944b56933f7d4029fb" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS918%2B_42962.pat" - md5: "d5b62813ebc2d78bdbdf08b2c42e1280" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -105,17 +75,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS918%2B_64570.pat" - md5: "4fab55b87cb153239536cca3947f4513" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 00c614ab..48f99f03 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml @@ -31,86 +31,53 @@ dom: 2 dt: true disks: 4 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS920%2B_25556.pat" - md5: "6b20f985a5a7fc4c40cab223a96c173b" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-25556-post-init-script.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS920%2B_42218.pat" - md5: "55a7e4ccbf6fcba9238a11976a4a7381" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS920%2B_42661.pat" - md5: "fa3936a53299b1a1142e4c614e2b360c" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS920%2B_42962.pat" - md5: "69792ae34d9b3c6e707d0e3e6b82816f" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS920%2B_64570.pat" - md5: "753b33e8c92bbf331be8e58dd97c242f" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml index ed0bb45b..a89f70b3 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml @@ -26,35 +26,27 @@ dom: 2 dt: true disks: 4 beta: true -builds: - 42962: - ver: "7.1.1" +productvers: + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS923%2B_42962.pat" - md5: "fd4d36adb0645f7c1215854405da62c3" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS923%2B_64570.pat" - md5: "8504b920d4af57a5daa3d573cac34870" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 783d2abf..8c7bcb82 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml @@ -30,52 +30,27 @@ dom: 2 dt: true disks: 2 beta: false -builds: - 42661: - ver: "7.1.0" +productvers: + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA1622_42661.pat" - md5: "27515a2e7c2f2113ccf8955bf22f3974" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA1622_42962.pat" - md5: "6073f5daa75a0eda84e6a3f3cbae4920" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA1622_64570.pat" - md5: "5729fdc37d56ba46e556a5b6aa931b42" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml index 2d814de8..15c07755 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml @@ -30,18 +30,14 @@ dom: 2 dt: false disks: 4 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DVA3219_25556.pat" - md5: "20f034e7fa233d95a0160d7479474906" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -49,17 +45,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3219_42218.pat" - md5: "4345e7cff9ba4fe97793c254c87b3ed5" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -67,35 +59,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3219_42661.pat" - md5: "5c4dea4a45d96e1a6d5bcc041d300079" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3219_42962.pat" - md5: "6aa37856c3bf2a390f99420b2e7dffa4" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -103,17 +73,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3219_64570.pat" - md5: "fe64fb7cbcdb699b086579a4a12029f6" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.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 c8e148fe..c23b2339 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml @@ -32,18 +32,14 @@ dom: 2 dt: false disks: 4 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DVA3221_25556.pat" - md5: "bfe93fcc3a0f4e41eaf7a3a3b865124b" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -51,17 +47,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat" - md5: "e3455afd4644cb882cb2c9bede08c7bf" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -69,35 +61,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3221_42661.pat" - md5: "d433ae251ba95754edde1586851d1e0a" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3221_42962.pat" - md5: "23a98723cacf1e1bd248cf8ab07bd788" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -105,17 +75,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3221_64570.pat" - md5: "2002e02d355c43e266222307e041302a" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml index 464f8dd8..10c3c520 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml @@ -26,69 +26,40 @@ dom: 2 dt: true disks: 12 beta: true -builds: - 42218: - ver: "7.0.1" +productvers: + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat" - md5: "9562d49a07f5481208b672ff777f3cbf" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat" - md5: "e071c4984d041309f151de29b9ba82b5" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS2500_42962.pat" - md5: "169493af5375eb9da89ff324a3fe129a" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS2500_64570.pat" - md5: "faab7cd3b7456a406f4be1afe9012d5d" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled index 4a4a7871..21e49ba1 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled @@ -26,86 +26,53 @@ dom: 2 dt: true disks: 24 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_FS6400_25556.pat" - md5: "c2d4e93551189532d8bd7bbcf2f55411" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-25556-post-init-script.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS6400_42218.pat" - md5: "e7887381980432a7be5ddf4dec0772ad" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS6400_42661.pat" - md5: "030064272d82777681502745fcfa8c48" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS6400_42962.pat" - md5: "651be491d10a47ecc534295d84341c03" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS6400_64570.pat" - md5: "2e69250e65f75bd4bb9e8274d865bc70" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml index 0e23d7d4..c09ee08a 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml @@ -29,86 +29,53 @@ dom: 2 dt: true disks: 8 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS1221%2B_25556.pat" - md5: "121a66f051ece4cf08ebb492f964a4d5" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-25556-post-init-script.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS1221%2B_42218.pat" - md5: "9ab734898b1f8af906b65ff91bf2b399" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-common-post-init-script.patch" - 42661: - ver: "7.1" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS1221%2B_42661.pat" - md5: "9fbcbffb36e86b86584b416e45d8d0bd" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS1221%2B_42962.pat" - md5: "441e25883733556af6fb6cbab74090fd" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS1221%2B_64570.pat" - md5: "d71d82a7b5d978ad14e351817d176578" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml index 9a878426..9fd94174 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml @@ -26,18 +26,14 @@ dom: 2 dt: false disks: 4 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS1619xs%2B_25556.pat" - md5: "0658c032de104ae55950c256b697132d" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -45,17 +41,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS1619xs%2B_42218.pat" - md5: "1ef98087cb11be286a8eac26f55dbe52" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -63,35 +55,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS1619xs%2B_42661.pat" - md5: "0c0b793d8ae1f0a1ecba66e280bd81e7" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS1619xs%2B_42962.pat" - md5: "7e0747b8808941d51c35de503473b62e" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -99,17 +69,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS1619xs%2B_64570.pat" - md5: "631c7162e33a11d4555121a188540c83" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml index 4c6ad0f5..5c7d73ae 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml @@ -29,18 +29,14 @@ dom: 1 dt: false disks: 16 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "3.10.105" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3413xs%2B_25556.pat" - md5: "9651b2cd3fd42e45450a72617fbb2803" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -48,17 +44,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "3.10.108" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3413xs%2B_42218.pat" - md5: "2f2e7312db70ca36b3c09236f117f23f" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -66,35 +58,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "3.10.108" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3413xs%2B_42661.pat" - md5: "f4ffa894e9b7218ea12d601d493fcda2" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "3.10.108" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS3413xs%2B_42962.pat" - md5: "508ed0ce3b827dcff5f6796700098a5c" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml index 0b135d90..1bae05fd 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml @@ -30,18 +30,14 @@ dom: 2 dt: false disks: 12 beta: false -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "3.10.105" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3618xs_25556.pat" - md5: "d71c24813b6f1032a5f55e6dc206985f" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -49,17 +45,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3618xs_42218.pat" - md5: "e91236e37fdbbb3a4f368dffa5a63013" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -67,35 +59,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3618xs_42661.pat" - md5: "f36f1f22a48b184358823b6168a904fd" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS3618xs_42962.pat" - md5: "dce0cd634df74b45c09379d9f348c16d" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -103,17 +73,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3618xs_64570.pat" - md5: "bcf1a8b41452fd8bf8f35d2e698894ce" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml index aebd97e6..ed5aaae1 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml @@ -26,18 +26,14 @@ dom: 2 dt: false disks: 12 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3621xs%2B_25556.pat" - md5: "e493fbac6a3b0116a8286e42ff0e4559" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -45,17 +41,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3621xs%2B_42218.pat" - md5: "f2b6896f7ea7237bd52501f80e502396" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -63,35 +55,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3621xs%2B_42661.pat" - md5: "5dd0954d761e8ac81f3e2f50e088fb8e" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS3621xs%2B_42962.pat" - md5: "02d56d400ac1c57593bc2faf9cc16a9b" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -99,17 +69,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3621xs%2B_64570.pat" - md5: "b1517fb23721192de7e666da8cd2ae00" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml index 1221a9b4..878b1792 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml @@ -26,18 +26,14 @@ dom: 2 dt: false disks: 16 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS4021xs%2B_25556.pat" - md5: "b5f616abfbed3ab61d1fa043ae3d67aa" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -45,17 +41,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat" - md5: "cbcb77548de26b6843ab31d7a7258b62" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -63,35 +55,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS4021xs%2B_42661.pat" - md5: "ddbbbcf8ccb8d9d345df3e08debc66f6" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS4021xs%2B_42962.pat" - md5: "cef9e139ddc27ddcc61f5423bac47659" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -99,17 +69,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS4021xs%2B_64570.pat" - md5: "a55ff87947b0ad53e981dc1ffd23c829" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml index 850aca00..186bdec8 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml @@ -28,18 +28,14 @@ dom: 1 dt: false disks: 12 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_SA3400_25556.pat" - md5: "c6918f2e859cb84ff7349e93cef51237" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -47,17 +43,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_SA3400_42218.pat" - md5: "236dbf3601ffec5259a3c9d42bb640ba" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -65,35 +57,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3400_42661.pat" - md5: "ae40bcb16dc2c6977371bd0349dde3c2" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3400_42962.pat" - md5: "cc0a219656db7ef26587ed59bbf1643f" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -101,17 +71,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3400_64570.pat" - md5: "eabb43133e9136a808bc7f4442f01000" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled index 72da0af9..080b7c8b 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled @@ -30,18 +30,14 @@ dom: 1 dt: false disks: 12 beta: true -builds: - 25556: - ver: "6.2.4" +productvers: + "6.2": kver: "4.4.59" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_SA3600_25556.pat" - md5: "5fcc06efe85c74276736dd49717c33f1" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-25556-init-script.patch" @@ -49,17 +45,13 @@ builds: - "ramdisk-25556-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42218: - ver: "7.0.1" + "7.0": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_SA3600_42218.pat" - md5: "64c75bdf8d28761cb294e41bf3aee2e9" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -67,35 +59,13 @@ builds: - "ramdisk-common-post-init-script.patch" - "ramdisk-common-disable-disabled-ports.patch" - 42661: - ver: "7.1.0" + "7.1": kver: "4.4.180" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3600_42661.pat" - md5: "ece886eba8b0c2eaf260704dbd20f9a7" - patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42661-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" - - 42962: - ver: "7.1.1" - kver: "4.4.180" - rd-compressed: false - cmdline: - <<: *cmdline - synoinfo: - <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3600_42962.pat" - md5: "7c21732ca4f4cb4cf43538a3d9497cf8" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-init-script.patch" @@ -103,17 +73,13 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "4.4.302" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3600_64570.pat" - md5: "cc489fe3b383290713dd13f363a1ee7e" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml index 2ac4d9a1..39e8fea3 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml @@ -24,35 +24,27 @@ dom: -1 dt: true disks: 16 beta: true -builds: - 42962: - ver: "7.1.1" +productvers: + "7.1": kver: "5.10.55" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_SA6400_42962.pat" - md5: "7bb63d65829b2ad4bcfda3b37e0ac1b1" patch: - "ramdisk-common-disable-root-pwd.patch" - "ramdisk-common-sa6400-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64570: - ver: "7.2.0" + "7.2": kver: "5.10.55" rd-compressed: false cmdline: <<: *cmdline synoinfo: <<: *synoinfo - pat: - url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA6400_64570.pat" - md5: "83b591bfb240c51b2feff8f02eac8bde" patch: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-sa6400-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index 135c48db..e099a8ae 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -25,35 +25,47 @@ rm -rf "${RAMDISK_PATH}" # Force clean mkdir -p "${RAMDISK_PATH}" (cd "${RAMDISK_PATH}"; xz -dc <"${ORI_RDGZ_FILE}" | cpio -idm) >/dev/null 2>&1 -# Check if DSM buildnumber changed -. "${RAMDISK_PATH}/etc/VERSION" - +# get user data MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" -BUILD="$(readConfigKey "build" "${USER_CONFIG_FILE}")" +PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" +BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")" +SMALLNUM="$(readConfigKey "smallnum" "${USER_CONFIG_FILE}")" LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")" SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")" LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")" KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")" +PATURL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")" +PATSUM="$(readConfigKey "patsum" "${USER_CONFIG_FILE}")" -if [ ${BUILD} -ne ${buildnumber} ]; then - echo -e "\033[A\n\033[1;32mBuild number changed from \033[1;31m${BUILD}\033[1;32m to \033[1;31m${buildnumber}\033[0m" +# Check if DSM buildnumber changed +. "${RAMDISK_PATH}/etc/VERSION" + +if [ -n "${PRODUCTVER}" -a -n "${BUILDNUM}" -a -n "${SMALLNUM}" ] && \ + ([ ! "${PRODUCTVER}" = "${majorversion}.${minorversion}" ] || [ ! "${BUILDNUM}" = "${buildnumber}" ] || [ ! "${SMALLNUM}" = "${smallfixnumber}" ]); then + OLDVER="${PRODUCTVER}(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))" + NEWVER="${majorversion}.${minorversion}(${buildnumber}$([ ${smallfixnumber:-0} -ne 0 ] && echo "u${smallfixnumber}"))" + echo -e "\033[A\n\033[1;32mBuild number changed from \033[1;31m${OLDVER}\033[1;32m to \033[1;31m${NEWVER}\033[0m" echo -n "Patching Ramdisk." - # Update new buildnumber - BUILD=${buildnumber} - writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}" + PATURL="" + PATSUM="" fi +# Update new buildnumber +PRODUCTVER=${majorversion}.${minorversion} +BUILDNUM=${buildnumber} +SMALLNUM=${smallfixnumber} +writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}" +writeConfigKey "buildnum" "${BUILDNUM}" "${USER_CONFIG_FILE}" +writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}" echo -n "." # Read model data UNIQUE=$(readModelKey "${MODEL}" "unique") PLATFORM="$(readModelKey "${MODEL}" "platform")" -KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")" -PAT_URL="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.url")" -PAT_MD5="$(readModelKey "${MODEL}" "builds.${BUILD}.pat.md5")" -RD_COMPRESSED="$(readModelKey "${MODEL}" "builds.${BUILD}.rd-compressed")" +KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" +RD_COMPRESSED="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].rd-compressed")" # Sanity check -[ -z "${PLATFORM}" -o -z "${KVER}" ] && (die "ERROR: Configuration for model ${MODEL} and buildnumber ${BUILD} not found." | tee -a "${LOG_FILE}") +[ -z "${PLATFORM}" -o -z "${KVER}" ] && (die "ERROR: Configuration for model ${MODEL} and productversion ${PRODUCTVER} not found." | tee -a "${LOG_FILE}") declare -A SYNOINFO declare -A ADDONS @@ -77,7 +89,7 @@ while read f; do echo -n "." echo "Patching with ${f}" >"${LOG_FILE}" 2>&1 (cd "${RAMDISK_PATH}" && patch -p1 <"${PATCH_PATH}/${f}") >>"${LOG_FILE}" 2>&1 || dieLog -done < <(readModelArray "${MODEL}" "builds.${BUILD}.patch") +done < <(readModelArray "${MODEL}" "productvers.[${PRODUCTVER}].patch") # Patch /etc/synoinfo.conf echo -n "." @@ -137,9 +149,8 @@ echo "#!/bin/sh" >"${RAMDISK_PATH}/addons/addons echo 'echo "addons.sh called with params ${@}"' >>"${RAMDISK_PATH}/addons/addons.sh" 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}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export MLINK=${PATURL}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export MCHECKSUM=${PATSUM}" >>"${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" @@ -164,7 +175,7 @@ for ADDON in ${!ADDONS[@]}; do echo "/addons/${ADDON}.sh \${1} ${PARAMS}" >>"${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog done -[ "2" = "${BUILD:0:1}" ] && sed -i 's/function //g' $(find "${RAMDISK_PATH}/addons/" -type f -name "*.sh") +[ "2" = "${BUILDNUM:0:1}" ] && sed -i 's/function //g' $(find "${RAMDISK_PATH}/addons/" -type f -name "*.sh") # Enable Telnet echo "inetd" >>"${RAMDISK_PATH}/addons/addons.sh" @@ -191,5 +202,4 @@ rm -rf "${RAMDISK_PATH}" # Update SHA256 hash RAMDISK_HASH="$(sha256sum ${ORI_RDGZ_FILE} | awk '{print$1}')" writeConfigKey "ramdisk-hash" "${RAMDISK_HASH}" "${USER_CONFIG_FILE}" -writeConfigKey "smallfixnumber" "${smallfixnumber}" "${USER_CONFIG_FILE}" echo diff --git a/files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh b/files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh index f556ce80..8bce3075 100755 --- a/files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh +++ b/files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh @@ -4,8 +4,8 @@ . /opt/arpl/include/functions.sh MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" -BUILD="$(readConfigKey "build" "${USER_CONFIG_FILE}")" -KVER="$(readModelKey "${MODEL}" "builds.${BUILD}.kver")" +PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" +KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" # Adapted from: scripts/Makefile.lib # Usage: size_append FILE [FILE2] [FILEn]... diff --git a/guide.md b/guide.md index 65ff23b6..de034c5d 100644 --- a/guide.md +++ b/guide.md @@ -93,7 +93,7 @@ # 将dts文件放到/mnt/p1下,并重命名为model.dts. "/mnt/p1/model.dts" sed -i '/^.*\/addons\/disks.sh.*$/a [ -f "\/mnt\/p1\/model.dts" ] \&\& cp "\/mnt\/p1\/model.dts" "${RAMDISK_PATH}\/addons\/model.dts"' /opt/arpl/ramdisk-patch.sh ``` -* arpl 离线安装 (arpl_zh_CN(ver > ++-v1.3) / arpl-i18n): +* arpl 离线安装 (arpl_zh_CN(ver > ++-v1.3) / arpl-i18n(ver < 23.7.0>)): ```shell 1. arpl 下 # arpl下获取型号版本的pat下载地址 (替换以下命令中的 版本号和型号部分)