Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package product-builder-plugin-Tumbleweed for openSUSE:Factory checked in at 2023-02-16 21:09:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old) and /work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.22824 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed" Thu Feb 16 21:09:56 2023 rev:22 rq:1065966 version:1.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes 2023-02-10 14:34:03.257466615 +0100 +++ /work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.22824/product-builder-plugin-Tumbleweed.changes 2023-02-16 21:09:57.380259637 +0100 @@ -1,0 +2,6 @@ +Wed Feb 15 08:15:57 UTC 2023 - Adrian Schröter <adr...@suse.de> + +- 1.8.2 + * CycloneDX SBOM generation added + +------------------------------------------------------------------- Old: ---- product-builder-plugins-1.8.1.obscpio New: ---- product-builder-plugins-1.8.2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ product-builder-plugin-Tumbleweed.spec ++++++ --- /var/tmp/diff_new_pack.9xCjpG/_old 2023-02-16 21:09:59.888273305 +0100 +++ /var/tmp/diff_new_pack.9xCjpG/_new 2023-02-16 21:09:59.892273327 +0100 @@ -20,7 +20,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0-or-later Group: System/Management -Version: 1.8.1 +Version: 1.8.2 Release: 0 Source: product-builder-plugins-%version.tar.xz Provides: product-builder-plugin = %version-%release @@ -30,7 +30,7 @@ Requires: product-builder Requires: perl(YAML::XS) Supplements: product-builder -Requires: build >= 20230208 +Requires: build >= 20230215 %if 0%{?suse_version} Requires: instsource-susedata Requires: mkdosfs ++++++ _service ++++++ --- /var/tmp/diff_new_pack.9xCjpG/_old 2023-02-16 21:09:59.944273611 +0100 +++ /var/tmp/diff_new_pack.9xCjpG/_new 2023-02-16 21:09:59.948273632 +0100 @@ -5,8 +5,8 @@ <param name="revision">SLE_15</param> --> <param name="scm">git</param> - <param name="version">1.8.1</param> - <param name="revision">1.8.1</param> + <param name="version">1.8.2</param> + <param name="revision">1.8.2</param> </service> <service mode="manual" name="set_version" /> <service mode="buildtime" name="tar"/> ++++++ product-builder-plugins-1.8.1.obscpio -> product-builder-plugins-1.8.2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-plugins-1.8.1/KIWIDescrPlugin.pm new/product-builder-plugins-1.8.2/KIWIDescrPlugin.pm --- old/product-builder-plugins-1.8.1/KIWIDescrPlugin.pm 2023-02-08 14:13:44.000000000 +0100 +++ new/product-builder-plugins-1.8.2/KIWIDescrPlugin.pm 2023-02-15 14:10:30.000000000 +0100 @@ -358,6 +358,7 @@ # create SBOM data, if the build tool is available if (-x "/usr/lib/build/generate_sbom") { + # SPDX my $spdx_distro = $this->collect()->productData()->getInfo("PURL_DISTRO"); if (!$spdx_distro) { # some guessing for our old distros to avoid further changes there @@ -373,7 +374,15 @@ } } $spdx_distro = "--distro $spdx_distro" if $spdx_distro; - $cmd = "/usr/lib/build/generate_spdx_sbom --product $spdx_distro $masterpath > $masterpath.sbom.json"; + $cmd = "/usr/lib/build/generate_sbom $spdx_distro --product $masterpath > $masterpath.spdx.json"; + $call = $this -> callCmd($cmd); + $status = $call->[0]; + $out = join("\n",@{$call->[1]}); + $this->logMsg("I", "Called $cmd exit status: <$status> output: $out"); + return 1 if $status; + + # CycloneDX + $cmd = "/usr/lib/build/generate_sbom --format cyclonedx --product $masterpath > $masterpath.cdx.json"; $call = $this -> callCmd($cmd); $status = $call->[0]; $out = join("\n",@{$call->[1]}); ++++++ product-builder-plugins.obsinfo ++++++ --- /var/tmp/diff_new_pack.9xCjpG/_old 2023-02-16 21:10:00.108274504 +0100 +++ /var/tmp/diff_new_pack.9xCjpG/_new 2023-02-16 21:10:00.112274526 +0100 @@ -1,5 +1,5 @@ name: product-builder-plugins -version: 1.8.1 -mtime: 1675862024 -commit: 700714724c14322e2fdedab96c8b87eafd15acc5 +version: 1.8.2 +mtime: 1676466630 +commit: 0ffe995660daddbe8b0c3226fb7ca1ce2cafd78c