[openwrt/openwrt] build: fix including modules.mk for targets pulled in from feeds

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 27 04:45:20 PDT 2022


nbd pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/74eeee1698e8ee2031ab882174b1a07d2c553409

commit 74eeee1698e8ee2031ab882174b1a07d2c553409
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sun Sep 18 06:27:09 2022 +0200

    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 at nbd.name>
    (cherry-picked from commit 00094efec33f07c9dc16cce23be492430c40b3cc)
---
 package/kernel/linux/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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




More information about the lede-commits mailing list