diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2023-05-03 13:29:42 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2024-03-29 20:00:27 +0100 |
| commit | a998a12a2fe2b0f29b8bba11fec386b05c5ac1cc (patch) | |
| tree | d9ffe18d1da0d48e21b23e5cc9ce0007f97d627b | |
| parent | 27d227b6828f5b211e68aa633f82c94c65f27d63 (diff) | |
| download | openwrt-a998a12a2fe2b0f29b8bba11fec386b05c5ac1cc.tar.gz openwrt-a998a12a2fe2b0f29b8bba11fec386b05c5ac1cc.tar.bz2 openwrt-a998a12a2fe2b0f29b8bba11fec386b05c5ac1cc.zip | |
imagebuilder: add check if target is sourced from feed
The image generation would fail, if the target is included from a feed.
To fix this, check if targets is found in the feed directory.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Tested-by: Thomas Richard <thomas.richard@bootlin.com>
| -rw-r--r-- | target/imagebuilder/files/Makefile | 9 |
1 files 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), \ |