[openwrt/openwrt] build: fix kernel component in CycloneDX SBOM

LEDE Commits lede-commits at lists.infradead.org
Tue Apr 16 21:36:53 PDT 2024


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/340e3dc4537522f44f3b8247d90b132e8e293948

commit 340e3dc4537522f44f3b8247d90b132e8e293948
Author: Cedric DOURLENT <cedric.dourlent at softathome.com>
AuthorDate: Fri Mar 1 16:42:34 2024 +0100

    build: fix kernel component in CycloneDX SBOM
    
    As stated in the cycloneDX documentation, the field "type" is mandatory for all components.
    
    More details here (https://cyclonedx.org/docs/1.5/json/#components_items_type)
    
    Signed-off-by: Cedric DOURLENT <cedric.dourlent at softathome.com>
    (cherry picked from commit 84331215e57090a9cdae4af75af2539c39cd7de7)
---
 scripts/package-metadata.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index bc61577d22..b4855ce67a 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -675,6 +675,7 @@ sub gen_image_cyclonedxsbom() {
 		license => "GPL-2.0",
 		cpe_id  => "cpe:/o:linux:linux_kernel",
 		name    => "kernel",
+		category  => "operating-system",
 	};
 
 	my %abimap;
@@ -703,6 +704,7 @@ sub gen_image_cyclonedxsbom() {
 		if ($pkg->{category}) {
 			my $category = $pkg->{category};
 			my %cat_type = (
+				"operating-system"        => "operating-system",
 				"Firmware"        => "firmware",
 				"Libraries"       => "library"
 			);




More information about the lede-commits mailing list