From c905b0178cd6eff2e888b8a8cc80a453865d7714 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Wed, 23 Dec 2020 15:52:00 -0800 Subject: [PATCH] fixup #249, locate kernel config for "make kernel_config" properly --- kernel/makefile | 2 +- scripts/BuildScripts/KernelScripts/crossMenuConfig.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/makefile b/kernel/makefile index 61698fea4..2fff4b8a9 100644 --- a/kernel/makefile +++ b/kernel/makefile @@ -78,7 +78,7 @@ kernel_image_package_install: kernel_image_package .PHONY: kernel_config kernel_config: $(KERNEL_PATCHED) - $(PRAWNOS_KERNEL_SCRIPTS_MENUCONFIG) $(KERNEL_RESOURCES) $(PRAWNOS_KERNEL_BUILD) $(TARGET) + $(PRAWNOS_KERNEL_SCRIPTS_MENUCONFIG) $(KERNEL_RESOURCES) $(PRAWNOS_KERNEL_BUILD) $(TARGET) $(KERNEL_CONFIG) ### CLEAN RULES diff --git a/scripts/BuildScripts/KernelScripts/crossMenuConfig.sh b/scripts/BuildScripts/KernelScripts/crossMenuConfig.sh index b313c0bcc..512794f1a 100755 --- a/scripts/BuildScripts/KernelScripts/crossMenuConfig.sh +++ b/scripts/BuildScripts/KernelScripts/crossMenuConfig.sh @@ -37,10 +37,16 @@ then echo "No TARGET supplied" exit 1 fi +if [ -z "$4" ] +then + echo "No kernel config supplied" + exit 1 +fi RESOURCES=$1 BUILD_DIR=$2 TARGET=$3 +CONFIG=$4 ARCH_ARMHF=armhf ARCH_ARM64=arm64 @@ -58,6 +64,6 @@ else echo "no valid target arch specified" fi -cp $RESOURCES/config .config +cp $CONFIG .config make menuconfig ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILER .config -cp .config $RESOURCES/config +cp .config $CONFIG