Prior
e8725a932e16eaf6ec51add8c084d959cbe32ff2, version used to be
VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
After
e8725a932e16eaf6ec51add8c084d959cbe32ff2, 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>
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;
}
}
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;
}