catspeed-cc/openwrt
1
1
Fork 0
Code

build: add additional apk tags

Browse Source 
This commit adds additional information to the apk database. This new tags
are required for SBOM generation.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2025-09-30 14:47:38 +02:00 committed by Robert Marko
parent 862a4edfa6
commit 54d58b05e8
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/package-pack.mk
View File

@ -328,6 +328,22 @@ endif
APK_SCRIPTS_$(1)+=--script "post-deinstall:$$(ADIR_$(1))/postrm" APK_SCRIPTS_$(1)+=--script "post-deinstall:$$(ADIR_$(1))/postrm"
endif endif
ifneq ($(CONFIG_USE_APK),)
APK_TAGS_$(1):=
ifneq ($$(ABIV_$(1)),)
APK_TAGS_$(1)+=openwrt:abiversion=$$(ABIV_$(1))
endif
ifneq ($(SECTION),)
APK_TAGS_$(1)+=openwrt:section=$(SECTION)
endif
ifneq ($(PKG_CPE_ID),)
APK_TAGS_$(1)+=openwrt:cpe=$(PKG_CPE_ID)
endif
endif
TARGET_VARIANT:=$$(if $(ALL_VARIANTS),$$(if $$(VARIANT),$$(filter-out *,$$(VARIANT)),$(firstword $(ALL_VARIANTS)))) TARGET_VARIANT:=$$(if $(ALL_VARIANTS),$$(if $$(VARIANT),$$(filter-out *,$$(VARIANT)),$(firstword $(ALL_VARIANTS))))
ifeq ($(BUILD_VARIANT),$$(if $$(TARGET_VARIANT),$$(TARGET_VARIANT),$(BUILD_VARIANT))) ifeq ($(BUILD_VARIANT),$$(if $$(TARGET_VARIANT),$$(TARGET_VARIANT),$(BUILD_VARIANT)))
do_install= do_install=
@ -593,7 +609,7 @@ else
$(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \ $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \
--info "name:$(1)$$(ABIV_$(1))" \ --info "name:$(1)$$(ABIV_$(1))" \
--info "version:$(VERSION)" \ --info "version:$(VERSION)" \
$$(if $$(ABIV_$(1)),--info "tags:openwrt:abiversion=$$(ABIV_$(1))") \ $$(if $$(APK_TAGS_$(1)),--info "tags:$$(APK_TAGS_$(1))") \
--info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \ --info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \
$(if $(findstring all,$(PKGARCH)),--info "arch:noarch",--info "arch:$(PKGARCH)") \ $(if $(findstring all,$(PKGARCH)),--info "arch:noarch",--info "arch:$(PKGARCH)") \
--info "license:$(LICENSE)" \ --info "license:$(LICENSE)" \