From 914d2451cadb0e6cee9b79043c49cf153efe9371 Mon Sep 17 00:00:00 2001
From: Anay Wadhera <awadhera@berkeley.edu>
Date: Sun, 16 May 2021 16:20:04 -0700
Subject: kernelscripts: Fix module build support.

Change-Id: Iaebe95c89bad68e69a7cf79fe9faa7b3a84149c4
---
 buildkernel.sh        | 8 ++++----
 kernel_definitions.mk | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/buildkernel.sh b/buildkernel.sh
index 57d2c1b..e71e454 100755
--- a/buildkernel.sh
+++ b/buildkernel.sh
@@ -157,7 +157,7 @@ copy_modules_to_prebuilt()
 	mkdir -p ${KERNEL_MODULES_OUT}
 
 	MODULES=$(find ${MODULES_STAGING_DIR} -type f -name "*.ko")
-	if [ -n "${MODULES}" ]; then
+	if ${HAS_MODULES}; then
 		echo "======================"
 		echo " Copying modules files"
 		for FILE in ${MODULES}; do
@@ -197,7 +197,7 @@ copy_all_to_prebuilt()
 		mkdir -p ${PREBUILT_OUT}
 	fi
 
-	if [ ! -z "$MODULES" ]; then
+	if ${HAS_MODULES}; then
 		copy_modules_to_prebuilt ${PREBUILT_OUT}
 	fi
 
@@ -405,11 +405,11 @@ else
 	make_defconfig
 	headers_install
 	build_kernel
-	if [ ! -z "$MODULES" ]; then
+	if ${HAS_MODULES}; then
 		modules_install
 	fi
 	copy_all_to_prebuilt ${KERNEL_BINS}
-	if [ ! -z "$MODULES" ]; then
+	if ${HAS_MODULES}; then
 		archive_kernel_modules
 		save_unstripped_modules
 	fi
diff --git a/kernel_definitions.mk b/kernel_definitions.mk
index 68a8285..75f447c 100644
--- a/kernel_definitions.mk
+++ b/kernel_definitions.mk
@@ -159,6 +159,11 @@ _x := $(shell $(cmd))
 else
 TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG))
 TARGET_HAS_MODULES := $(shell grep "=m" $(TARGET_KERNEL_SOURCE)/arch/arm64/configs/$(KERNEL_DEFCONFIG))
+ifneq ($(TARGET_HAS_MODULES),)
+MODULES := true
+else
+MODULES := false
+endif
 endif
 
 # Generate the defconfig file from the fragments
@@ -285,7 +290,7 @@ define build-kernel
 	VENDOR_RAMDISK_KERNEL_MODULES="$(VENDOR_RAMDISK_KERNEL_MODULES)" \
 	TARGET_PRODUCT=$(TARGET_BOARD_PLATFORM) \
 	DTS_VENDOR=$(TARGET_DTS_VENDOR) \
-	MODULES=$(TARGET_HAS_MODULES) \
+	HAS_MODULES=$(MODULES) \
 	device/qcom/kernelscripts/buildkernel.sh \
 	$(cc) \
 	$(real_cc) \
-- 
cgit v1.2.3