From f88d19b575a71338c01b258b894cdd966c522048 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Fri, 11 Jun 2021 18:06:58 +0200 Subject: [PATCH] buildsystem: introduce $TARGET_KERNEL_PATCH_ARCH --- config/functions | 8 ++++---- projects/ARM/devices/ARMv8/options | 2 +- projects/Allwinner/devices/A64/options | 2 +- projects/Allwinner/devices/H5/options | 2 +- projects/Allwinner/devices/H6/options | 2 +- projects/Amlogic/devices/AMLGX/options | 2 +- projects/NXP/devices/iMX8/options | 2 +- projects/Qualcomm/devices/Dragonboard/options | 2 +- projects/Rockchip/devices/RK3328/options | 2 +- projects/Rockchip/devices/RK3399/options | 2 +- scripts/unpack | 2 ++ 11 files changed, 15 insertions(+), 13 deletions(-) diff --git a/config/functions b/config/functions index 9ad285b230..9954c23fba 100644 --- a/config/functions +++ b/config/functions @@ -763,8 +763,8 @@ check_arch() { linux_config_dir="${PROJECT_DIR}/${PROJECT}/linux" fi - if [ ! -e "$linux_config_dir/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf" ] && - ! ls "$linux_config_dir/"*/linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf &>/dev/null; then + if [ ! -e "$linux_config_dir/linux.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf" ] && + ! ls "$linux_config_dir/"*/linux.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf &>/dev/null; then arch_err_msg="\n $dashes$dashes$dashes" arch_err_msg="${arch_err_msg}\n ERROR: Architecture not found, use a valid Architecture" arch_err_msg="${arch_err_msg}\n for your project or create a new config" @@ -1246,7 +1246,7 @@ kernel_config_path() { pkg_linux_version="$(get_pkg_version linux)" pkg_linux_dir="$(get_pkg_directory linux)" - config_name="linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf" + config_name="linux.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf" for cfg in $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux/$pkg_linux_version/$config_name \ $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux/$LINUX/$config_name \ @@ -1268,7 +1268,7 @@ kernel_config_path() { kernel_initramfs_confs() { local config_name cfg confs - config_name="initramfs.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf" + config_name="initramfs.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf" confs="$(get_pkg_directory initramfs)/config/initramfs.conf" for cfg in $PROJECT_DIR/$PROJECT/packages/initramfs/config/$config_name \ diff --git a/projects/ARM/devices/ARMv8/options b/projects/ARM/devices/ARMv8/options index 61f481d675..6720e5c379 100644 --- a/projects/ARM/devices/ARMv8/options +++ b/projects/ARM/devices/ARMv8/options @@ -12,7 +12,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT="hard" TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/Allwinner/devices/A64/options b/projects/Allwinner/devices/A64/options index 2c4ce9b02e..9f61b4254c 100644 --- a/projects/Allwinner/devices/A64/options +++ b/projects/Allwinner/devices/A64/options @@ -13,7 +13,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT="hard" TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/Allwinner/devices/H5/options b/projects/Allwinner/devices/H5/options index 64ec31abbe..61b450d0c0 100644 --- a/projects/Allwinner/devices/H5/options +++ b/projects/Allwinner/devices/H5/options @@ -13,7 +13,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT="hard" TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/Allwinner/devices/H6/options b/projects/Allwinner/devices/H6/options index 0e5f216b77..7460367585 100644 --- a/projects/Allwinner/devices/H6/options +++ b/projects/Allwinner/devices/H6/options @@ -13,7 +13,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT="hard" TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/Amlogic/devices/AMLGX/options b/projects/Amlogic/devices/AMLGX/options index c304bd2517..8184f29439 100644 --- a/projects/Amlogic/devices/AMLGX/options +++ b/projects/Amlogic/devices/AMLGX/options @@ -12,7 +12,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT="hard" TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/NXP/devices/iMX8/options b/projects/NXP/devices/iMX8/options index 83beca73cc..cbc0b94602 100644 --- a/projects/NXP/devices/iMX8/options +++ b/projects/NXP/devices/iMX8/options @@ -12,7 +12,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT=hard TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/Qualcomm/devices/Dragonboard/options b/projects/Qualcomm/devices/Dragonboard/options index 0f81f8a086..091965bf6e 100644 --- a/projects/Qualcomm/devices/Dragonboard/options +++ b/projects/Qualcomm/devices/Dragonboard/options @@ -12,7 +12,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT=hard TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/Rockchip/devices/RK3328/options b/projects/Rockchip/devices/RK3328/options index c3b6eea87a..2190609269 100644 --- a/projects/Rockchip/devices/RK3328/options +++ b/projects/Rockchip/devices/RK3328/options @@ -12,7 +12,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT="hard" TARGET_CPU="cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/projects/Rockchip/devices/RK3399/options b/projects/Rockchip/devices/RK3399/options index caeca27ed9..d01a5479a6 100644 --- a/projects/Rockchip/devices/RK3399/options +++ b/projects/Rockchip/devices/RK3399/options @@ -12,7 +12,7 @@ ;; arm) TARGET_KERNEL_ARCH="arm64" - TARGET_PATCH_ARCH="aarch64" + TARGET_KERNEL_PATCH_ARCH="aarch64" TARGET_FLOAT="hard" TARGET_CPU="cortex-a72.cortex-a53" TARGET_CPU_FLAGS="+crc" diff --git a/scripts/unpack b/scripts/unpack index 392c5ba733..161fdf4ffb 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -126,6 +126,8 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists if [ "${TARGET_ARCH}" = "x86_64" ]; then PATCH_ARCH="x86" + elif [ "${PKG_IS_KERNEL_PKG}" = "yes" ]; then + PATCH_ARCH="${TARGET_KERNEL_PATCH_ARCH:-${TARGET_ARCH}}" else PATCH_ARCH="${TARGET_PATCH_ARCH:-${TARGET_ARCH}}" fi