diff options
| author | Petr Štetiar <ynezz@true.cz> | 2023-11-06 08:52:24 +0000 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2023-11-06 12:04:53 +0000 |
| commit | cfadbc090c3f2f886eecb20b0272a32de4b74194 (patch) | |
| tree | b6856dabb1e0dad513dffaaf2f356337b006acc0 | |
| parent | 7c43ced160a01ad2300bf103d457d9f2b20c2772 (diff) | |
| download | upstream-cfadbc090c3f2f886eecb20b0272a32de4b74194.tar.gz upstream-cfadbc090c3f2f886eecb20b0272a32de4b74194.tar.bz2 upstream-cfadbc090c3f2f886eecb20b0272a32de4b74194.zip | |
image: fix image generation within ImageBuilder
Changes introduced in commit d604a07225c5 ("build: add CycloneDX SBOM
JSON support") broke ImageBuilder:
Cannot open '/openwrt-imagebuilder-ath79-generic.Linux-x86_64/tmp/.packageinfo': No such file or directory
So lets fix it by wrapping the BOM generation behind condition of IB
feature check.
Fixes: #13881
Fixes: d604a07225c5 ("build: add CycloneDX SBOM JSON support")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit c4259a658673cc1a02ed17bfa8e94de17de00ad2)
| -rw-r--r-- | include/image.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/image.mk b/include/image.mk index 3d5d6c1613..62e05b2567 100644 --- a/include/image.mk +++ b/include/image.mk @@ -277,11 +277,13 @@ endef define Image/Manifest $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \ $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest +ifndef IB $(if $(CONFIG_JSON_CYCLONEDX_SBOM), \ $(SCRIPT_DIR)/package-metadata.pl imgcyclonedxsbom \ $(TMP_DIR)/.packageinfo \ $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest > \ $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).bom.cdx.json) +endif endef define Image/gzip-ext4-padded-squashfs |