Keep split usr if original system has it, add extra logic if no split usr

1 files changed, 5 insertions, 4 deletions

diff --git a/remote/modules/kernel/module.build b/remote/modules/kernel/module.build
index 78179df6..7d840c7b 100644
--- a/remote/modules/kernel/module.build
+++ b/remote/modules/kernel/module.build
@@ -2,17 +2,18 @@
 
 # This overrides get_kernel_version from kernel.inc, so the variables will be set properly
 get_kernel_version() {
+	# Do not use MODULE_DIR here as this function might run when we process another module!
 	[ -n "${TARGET_KERNEL_LONG}" ] && return 0
-	[ ! -e "${MODULE_DIR}/ksrc/include/generated/utsrelease.h" ] && return 0
+	[ ! -e "${TARGET_DIR}/kernel/ksrc/include/generated/utsrelease.h" ] && return 0
 	# determine kernel version that will be running in the generated system
 
 	# declare kernel version stuff
-	declare -rg TARGET_KERNEL_LONG=$(grep 'UTS_RELEASE' "${MODULE_DIR}/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}')
+	declare -rg TARGET_KERNEL_LONG=$(grep 'UTS_RELEASE' "${TARGET_DIR}/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}')
 	declare -rg TARGET_KERNEL_SHORT=$(echo "$TARGET_KERNEL_LONG" | grep -o -E '^[0-9\.]+')
 
 	# declare path to kernel headers and modules/firmware
-	declare -rg KERNEL_HEADERS_DIR="${MODULE_DIR}/ksrc"
-	declare -rg KERNEL_BASE_DIR="${MODULE_DIR}/build"
+	declare -rg KERNEL_HEADERS_DIR="${TARGET_DIR}/kernel/ksrc"
+	declare -rg KERNEL_BASE_DIR="${TARGET_DIR}/kernel/build"
 
 	# print debug info
 	pinfo "TARGET_KERNEL_LONG: '$TARGET_KERNEL_LONG'"