From: Florian Eckert Date: Thu, 25 Jan 2024 09:25:06 +0000 (+0100) Subject: imagebuilder: check if BOARD is located in the feeds sub directory X-Git-Url: http://git.openwrt.org/openwrt/feeds.git?a=commitdiff_plain;h=27d227b6828f5b211e68aa633f82c94c65f27d63;p=openwrt%2Fstaging%2Fxback.git 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 Tested-by: Thomas Richard --- 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