[openwrt/openwrt] imagebuilder: check if BOARD is located in the feeds sub directory

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/27d227b6828f5b211e68aa633f82c94c65f27d63

commit 27d227b6828f5b211e68aa633f82c94c65f27d63
Author: Florian Eckert <fe at dev.tdt.de>
AuthorDate: Thu Jan 25 10:25:06 2024 +0100

    imagebuilder: check if BOARD is located in the feeds sub directory
    
    Fixes the regression so that targets that were installed via a feed can
    also be build again with the Image Builder.
    
    Fixes: 84ec8c4 ("imagebuilder: copy from buildroot only target/linux")
    Signed-off-by: Florian Eckert <fe at dev.tdt.de>
    Tested-by: Thomas Richard <thomas.richard at bootlin.com>
---
 target/imagebuilder/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index c3b6c9c10c..799ac3be55 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -80,7 +80,13 @@ endif
 
 	$(CP) -L $(TOPDIR)/target/linux/Makefile $(PKG_BUILD_DIR)/target/linux
 	$(CP) -L $(TOPDIR)/target/linux/generic $(PKG_BUILD_DIR)/target/linux
-	$(CP) -L $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux
+	# check if board is installed from a feeds subdirectory
+	if [ -d $(TOPDIR)/target/linux/feeds/$(BOARD) ]; then \
+		mkdir -p $(PKG_BUILD_DIR)/target/linux/feeds; \
+		$(CP) -L $(TOPDIR)/target/linux/feeds/$(BOARD) $(PKG_BUILD_DIR)/target/linux/feeds; \
+	else \
+		$(CP) -L $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux; \
+	fi
 	if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \
 		$(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \
 	fi