summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Thomson <git@johnthomson.fastmail.com.au>2023-07-01 10:23:35 +1000
committerHauke Mehrtens <hauke@hauke-m.de>2023-07-04 19:29:41 +0200
commitb3448b3fdb59d25dce05991dc8f322c1020b090b (patch)
treee5a9df0f8e53908bcc236107bac1c3ee8464703d /include
parentce8c639a6c539534be14a540e7c3e9933d3a34ef (diff)
downloadopenwrt-b3448b3fdb59d25dce05991dc8f322c1020b090b.tar.gz
openwrt-b3448b3fdb59d25dce05991dc8f322c1020b090b.tar.bz2
openwrt-b3448b3fdb59d25dce05991dc8f322c1020b090b.zip
kernel: fix KernelPackage when all KCONFIG are versioned
If a kernel package was defined where all KCONFIG symbols were dynamic, and versioned, no FILES would be installed, as the foreach evaluation was providing the value of the variable defined by the KCONFIG symbol name including the version test Fix this by calling the version_filter function on the list of KCONFIG variable names run through by foreach Example, kernel 6.1: KCONFIG:=CONFIG_OLD@lt6.1 CONFIG_NEW@ge6.1 filter-out any KCONFIG settings forced by package: CONFIG_OLD@lt6.1 CONFIG_NEW@ge6.1 there are dynamic settings, so for each of them, get the value of the make variable defined by symbol name: CONFIG_OLD@lt6.1 is not set CONFIG_NEW@ge6.1 is not set versus CONFIG_OLD is not set CONFIG_NEW=m test if any of these are m, or y if yes, install files, otherwise, nothing to install Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
Diffstat (limited to 'include')
-rw-r--r--include/kernel.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index b1ae42534d..3012eb8993 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -236,7 +236,7 @@ $(call KernelPackage/$(1)/config)
$(call KernelPackage/depends)
$(call KernelPackage/hooks)
- ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
+ ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(call version_filter,$(filter-out %=y %=n %=m,$(KCONFIG))),$($(c)))),.),)
define Package/kmod-$(1)/install
@for mod in $$(call version_filter,$$(FILES)); do \
if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \