From: Hauke Mehrtens Date: Wed, 14 Dec 2022 15:29:16 +0000 (+0100) Subject: kernel: Make KERNEL_MAKEOPTS recursively expanded X-Git-Tag: v23.05.0-rc1~1546 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=06ad3adeecc27859313e60c173c435d45ac2b345;p=openwrt%2Fstaging%2Fhauke.git kernel: Make KERNEL_MAKEOPTS recursively expanded KERNEL_MAKEOPTS will get expanded when it is used and not when it is defined in the kernel.mk file now. This fixes problems finding dependent kernel modules when it is used by a kernel module package. Without this change the build of packages which depend on other out of tree modules failed when they used KERNEL_MAKE because some symbols could not be found. This happened because KERNEL_MAKE_FLAGS which contains a "if $(__package_mk)" was evaluated where KERNEL_MAKEOPTS was defined and not when the KERNEL_MAKE was used. For packages which included kernel.mk before package.mk we saw this problem. One workaround was to use the correct include order and the other one was to not use KERNEL_MAKE_FLAGS, but copy its content. Signed-off-by: Hauke Mehrtens --- diff --git a/include/kernel.mk b/include/kernel.mk index 2efa3bf8f8..c657bf5d82 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -130,7 +130,7 @@ ifneq ($(HOST_OS),Linux) export SKIP_STACK_VALIDATION:=1 endif -KERNEL_MAKEOPTS := -C $(LINUX_DIR) $(KERNEL_MAKE_FLAGS) +KERNEL_MAKEOPTS = -C $(LINUX_DIR) $(KERNEL_MAKE_FLAGS) ifdef CONFIG_USE_SPARSE KERNEL_MAKEOPTS += C=1 CHECK=$(STAGING_DIR_HOST)/bin/sparse