projects / openwrt / staging / blocktrron.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7c43ced) | patch
image: fix image generation within ImageBuilder
authorPetr Štetiar <ynezz@true.cz>
Mon, 6 Nov 2023 08:52:24 +0000 (08:52 +0000)
committerPetr Štetiar <ynezz@true.cz>
Mon, 6 Nov 2023 12:04:53 +0000 (12:04 +0000)
commitcfadbc090c3f2f886eecb20b0272a32de4b74194
treeb6856dabb1e0dad513dffaaf2f356337b006acc0tree | snapshot
parent7c43ced160a01ad2300bf103d457d9f2b20c2772commit | diff
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)
include/image.mk diff | blob | history
Staging tree of David Bauer