From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 18 Sep 2022 04:27:09 +0000 (+0200)
Subject: build: fix including modules.mk for targets pulled in from feeds
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=74eeee1698e8ee2031ab882174b1a07d2c553409;p=openwrt%2Fstaging%2Fblocktrron.git

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)
---

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