From ea9027651e652ef932d2bfe26095923955fb5497 Mon Sep 17 00:00:00 2001 From: Ing Date: Thu, 6 Jul 2023 19:09:53 +0800 Subject: [PATCH] split epyc7002 --- files/board/arpl/overlayfs/opt/arpl/menu.sh | 16 ++++++++++------ .../overlayfs/opt/arpl/model-configs/SA6400.yml | 2 ++ .../arpl/overlayfs/opt/arpl/ramdisk-patch.sh | 5 +++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 078ec032..5a61dff1 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -223,6 +223,7 @@ function productversMenu() { # Check addons PLATFORM="$(readModelKey "${MODEL}" "platform")" KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" + KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" while IFS=': ' read ADDON PARAM; do [ -z "${ADDON}" ] && continue if ! checkAddonExist "${ADDON}" "${PLATFORM}" "${KVER}"; then @@ -233,7 +234,7 @@ function productversMenu() { writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" while read ID DESC; do writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}" - done < <(getAllModules "${PLATFORM}" "${KVER}") + done < <(getAllModules "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") # Remove old files rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" DIRTY=1 @@ -387,9 +388,11 @@ function addonMenu() { function moduleMenu() { PLATFORM="$(readModelKey "${MODEL}" "platform")" KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" + KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" + dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ --infobox "$(TEXT "Reading modules")" 0 0 - ALLMODULES=$(getAllModules "${PLATFORM}" "${KVER}") + ALLMODULES=$(getAllModules "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") unset USERMODULES declare -A USERMODULES while IFS=': ' read KEY VALUE; do @@ -423,7 +426,7 @@ function moduleMenu() { --infobox "$(TEXT "Selecting loaded modules")" 0 0 KOLIST="" for I in $(lsmod | awk -F' ' '{print $1}' | grep -v 'Module'); do - KOLIST+="$(getdepends ${PLATFORM} ${KVER} ${I}) ${I} " + KOLIST+="$(getdepends "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}" "${I}") ${I} " done KOLIST=($(echo ${KOLIST} | tr ' ' '\n' | sort -u)) unset USERMODULES @@ -505,9 +508,9 @@ function moduleMenu() { done popd if [ -n "${USER_FILE}" -a "${USER_FILE##*.}" = "ko" ]; then - addToModules ${PLATFORM} ${KVER} "${TMP_UP_PATH}/${USER_FILE}" + addToModules ${PLATFORM} "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}" "${TMP_UP_PATH}/${USER_FILE}" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ - --msgbox "$(printf "$(TEXT "Module '%s' added to %s-%s")" "${USER_FILE}" ${PLATFORM} ${KVER})" 0 0 + --msgbox "$(printf "$(TEXT "Module '%s' added to %s-%s")" "${USER_FILE}" "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}")" 0 0 rm -f "${TMP_UP_PATH}/${USER_FILE}" else dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ @@ -1606,11 +1609,12 @@ function updateExts() { # Rebuild modules if model/buildnumber is selected PLATFORM="$(readModelKey "${MODEL}" "platform")" KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" + KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" if [ -n "${PLATFORM}" -a -n "${KVER}" ]; then writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" while read ID DESC; do writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}" - done < <(getAllModules "${PLATFORM}" "${KVER}") + done < <(getAllModules "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") fi elif [ "${1}" = "LKMs" ]; then rm -rf "${LKM_PATH}/"* 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 39e8fea3..e403dcff 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml @@ -26,6 +26,7 @@ disks: 16 beta: true productvers: "7.1": + kpre: "7.1" kver: "5.10.55" rd-compressed: false cmdline: @@ -39,6 +40,7 @@ productvers: - "ramdisk-42951-post-init-script.patch" "7.2": + kpre: "7.2" kver: "5.10.55" rd-compressed: false cmdline: diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index e099a8ae..fb5adfc4 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -62,6 +62,7 @@ echo -n "." UNIQUE=$(readModelKey "${MODEL}" "unique") PLATFORM="$(readModelKey "${MODEL}" "platform")" KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" +KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" RD_COMPRESSED="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].rd-compressed")" # Sanity check @@ -118,7 +119,7 @@ echo -n "." # Extract modules to ramdisk rm -rf "${TMP_PATH}/modules" mkdir -p "${TMP_PATH}/modules" -tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" +tar -zxf "${MODULES_PATH}/${PLATFORM}-$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}.tgz" -C "${TMP_PATH}/modules" for F in $(ls "${TMP_PATH}/modules/"*.ko); do M=$(basename ${F}) if arrayExistItem "${M:0:-3}" "${!USERMODULES[@]}"; then @@ -136,7 +137,7 @@ echo -n "." # Copying fake modprobe cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe" # Copying LKM to /usr/lib/modules -gzip -dc "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko.gz" >"${RAMDISK_PATH}/usr/lib/modules/rp.ko" +gzip -dc "${LKM_PATH}/rp-${PLATFORM}-$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}-${LKM}.ko.gz" >"${RAMDISK_PATH}/usr/lib/modules/rp.ko" # Addons #MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"`