fixup SolidHal#249, locate kernel config for "make kernel_config" pro…

…perly
cracket · Dec 23, 2020 · c905b01 · c905b01
1 parent 1bf930b
commit c905b01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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