aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2022-09-18 06:27:09 +0200
committerFelix Fietkau <nbd@nbd.name>2022-09-27 13:45:03 +0200
commit74eeee1698e8ee2031ab882174b1a07d2c553409 (patch)
treea8714511220c43fba9121abc9df0f59febd8e147
parentdafac183f3c661c939a1d556da0e81df5540bcf1 (diff)
downloadupstream-74eeee1698e8ee2031ab882174b1a07d2c553409.tar.gz
upstream-74eeee1698e8ee2031ab882174b1a07d2c553409.tar.bz2
upstream-74eeee1698e8ee2031ab882174b1a07d2c553409.zip
build: fix including modules.mk for targets pulled in from feeds
Fixes: ebc36ebb2349 ("scripts/feeds: install targets to target/linux/feeds and support overriding") Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry-picked from commit 00094efec33f07c9dc16cce23be492430c40b3cc)
-rw-r--r--package/kernel/linux/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/kernel/linux/Makefile b/package/kernel/linux/Makefile
index 9fa68d78f7..ad68bde9b3 100644
--- a/package/kernel/linux/Makefile
+++ b/package/kernel/linux/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=kernel
PKG_FLAGS:=hold
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
-SCAN_DEPS=modules/*.mk $(TOPDIR)/target/linux/*/modules.mk $(TOPDIR)/include/netfilter.mk
+SCAN_DEPS=modules/*.mk $(TOPDIR)/target/linux/*/modules.mk $(TOPDIR)/target/linux/*/*/modules.mk $(TOPDIR)/include/netfilter.mk
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=
@@ -64,3 +64,4 @@ $(eval $(if $(DUMP),,$(call BuildPackage,kernel)))
include $(sort $(wildcard ./modules/*.mk))
-include $(TOPDIR)/target/linux/*/modules.mk
+-include $(TOPDIR)/target/linux/*/*/modules.mk