ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 21:58:04 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

build: fix version info in cyclonedx sbom

Browse Source 
Prior e8725a932e, version used to be
VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
After e8725a932e, the version is:
VERSION:=$(PKG_VERSION)-r$(PKG_RELEASE)

Hence the gen_*_cyclonedxsbom functions need to be updated to remove
the trailing -r prefix in the version in order to generate correct
version info in the SBOM.

Signed-off-by: Akshay Bhat <nodeax@gmail.com>
This commit is contained in:
Akshay Bhat 2024-04-19 11:26:45 -07:00 committed by Hauke Mehrtens
parent 85f6f88223
commit d8939ff2d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/package-metadata.pl
View File

@ -722,7 +722,7 @@ sub gen_image_cyclonedxsbom() {
if ($image_packages{$name}) {
$version = $image_packages{$name};
}
$version =~ s/-\d+$// if $version;
$version =~ s/-r\d+$// if $version;
if ($name =~ /^(kernel|kmod-)/ and $version =~ /^(\d+\.\d+\.\d+)/) {
$version = $1;
}
@ -775,7 +775,7 @@ sub gen_package_cyclonedxsbom() {
}
my $version = $pkg->{version};
$version =~ s/-\d+$// if $version;
$version =~ s/-r\d+$// if $version;
if ($name =~ /^(kernel|kmod-)/ and $version =~ /^(\d+\.\d+\.\d+)/) {
$version = $1;
}