[PATCH] imagebuilder: add check if target is sourced from a feed
Florian Eckert
fe at dev.tdt.de
Fri Oct 20 04:45:27 PDT 2023
If a target is not upstream because it is still under development, it
can still be added to the openwrt via a feed and can be build. Although
the build is successful, no new images can be build with the new board,
because it cannot find them.
To fix this issue add a check to the imagebuilder and test if the target
is located in the feed directory.
Signed-off-by: Florian Eckert <fe at dev.tdt.de>
---
The problem occurred when we started using the new LGM target from MXL
in Openwrt.
target/imagebuilder/files/Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 78ec7e2e94..0466fc7dcc 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -205,8 +205,13 @@ build_image: FORCE
@echo
@echo Building images...
rm -rf $(BUILD_DIR)/json_info_files/
- $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
- $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
+ if [ -d "target/linux/feeds/$(BOARD)" ]; then \
+ $(NO_TRACE_MAKE) -C target/linux/feeds/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
+ $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)"); \
+ else \
+ $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
+ $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)"); \
+ fi
$(BIN_DIR)/profiles.json: FORCE
$(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
--
2.30.2
More information about the openwrt-devel
mailing list