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 2021-09-20 23:31:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old)
and
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Mon Sep 20 23:31:55 2021 rev:18 rq:919730 version:1.4.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2021-04-18 21:45:18.704742268 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.1899/product-builder-plugin-Tumbleweed.changes
2021-09-20 23:32:11.283102038 +0200
@@ -1,0 +2,12 @@
+Fri Sep 17 09:02:02 UTC 2021 - Adrian Schr??ter <[email protected]>
+
+- 1.4.3
+ - comps meta data support
+
+-------------------------------------------------------------------
+Mon Sep 6 15:59:26 UTC 2021 - Adrian Schr??ter <[email protected]>
+
+- 1.4.0
+ - modulemd data support
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.3.1.obscpio
New:
----
product-builder-plugins-1.4.3.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.P50ecZ/_old 2021-09-20 23:32:12.251103233 +0200
+++ /var/tmp/diff_new_pack.P50ecZ/_new 2021-09-20 23:32:12.251103233 +0200
@@ -20,19 +20,22 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0-or-later
Group: System/Management
-Version: 1.3.1
+Version: 1.4.3
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
Requires: createrepo_c
+Requires: mtools
+Requires: product-builder
+Requires: perl(YAML::XS)
+Supplements: product-builder
+%if 0%{?suse_version}
Requires: instsource-susedata
Requires: mkdosfs
-Requires: mtools
Requires: openSUSE-appstream-process
Requires: package-EULAs
Requires: package-translations
-Requires: product-builder
-Supplements: product-builder
+%endif
BuildArch: noarch
%description
++++++ _service ++++++
--- /var/tmp/diff_new_pack.P50ecZ/_old 2021-09-20 23:32:12.283103273 +0200
+++ /var/tmp/diff_new_pack.P50ecZ/_new 2021-09-20 23:32:12.283103273 +0200
@@ -1,14 +1,14 @@
<services>
- <service name="obs_scm" mode="disabled">
+ <service name="obs_scm" mode="manual">
<param
name="url">https://github.com/openSUSE/product-builder-plugins.git</param>
<!--
<param name="revision">SLE_15</param>
-->
<param name="scm">git</param>
- <param name="version">1.3.1</param>
- <param name="revision">1.3.1</param>
+ <param name="version">1.4.3</param>
+ <param name="revision">1.4.3</param>
</service>
- <service mode="disabled" name="set_version" />
+ <service mode="manual" name="set_version" />
<service mode="buildtime" name="tar"/>
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
++++++ product-builder-plugins-1.3.1.obscpio ->
product-builder-plugins-1.4.3.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.3.1/KIWIDescrPlugin.pm
new/product-builder-plugins-1.4.3/KIWIDescrPlugin.pm
--- old/product-builder-plugins-1.3.1/KIWIDescrPlugin.pm 2021-04-15
16:10:51.000000000 +0200
+++ new/product-builder-plugins-1.4.3/KIWIDescrPlugin.pm 2021-09-17
13:30:25.000000000 +0200
@@ -138,6 +138,23 @@
);
}
if (-e "$masterpath/$licensename.tar") {
+ my $external_license_dir = $masterpath.".license";
+ $this->logMsg("I", "Extracting license.tar");
+ if (system("mkdir -p $external_license_dir")) {
+ $this->logMsg( "E", "mkdir failed!");
+ return 1;
+ }
+ system("tar xf $masterpath/$licensename.tar -C $external_license_dir");
+ my $result = $? >> 8;
+ if ($result != 0) {
+ $this->logMsg( "E", "Untar failed!");
+ return 1;
+ }
+ if ( ! -e "$external_license_dir/license.txt" ) {
+ $this->logMsg( "E", "No license.txt extracted!");
+ return 1;
+ }
+
$cmd = "$this->{m_modifyrepo}";
$cmd .= " --unique-md-filenames";
$cmd .= " --checksum=sha256";
@@ -254,12 +271,53 @@
$this->addLicenseFile($masterpath, "license-$product");
}
+ # rpm-md modulemd files
+ if (-e "/usr/src/packages/SOURCES/repos/_modulemd.yaml") {
+ $cmd = "/usr/lib/build/writemodulemd --filter
/usr/src/packages/SOURCES/repos/_modulemd.yaml $masterpath/repodata >
$masterpath/repodata/modules.yaml";
+ $call = $this -> callCmd($cmd);
+ $status = $call->[0];
+ my $out = join("\n",@{$call->[2]});
+ $this->logMsg("I",
+ "Called $cmd exit status: <$status> output: $out"
+ );
+ return 1 if $status;
+ $cmd = "/usr/bin/modifyrepo $masterpath/repodata/modules.yaml
$masterpath/repodata/";
+ $call = $this -> callCmd($cmd);
+ $status = $call->[0];
+ $out = join("\n",@{$call->[2]});
+ $this->logMsg("I",
+ "Called $cmd exit status: <$status> output: $out"
+ );
+ return 1 if $status;
+ unlink("$masterpath/repodata/modules.yaml");
+ }
+
+ # comps files from metapackages
+ #
+ if (-d "$masterpath/comps") {
+ opendir(DH, "$masterpath/comps");
+ foreach my $comps (readdir(DH)) {
+ next if $comps =~ /^\./m;
+ $cmd = "/usr/bin/modifyrepo $masterpath/comps/$comps
$masterpath/repodata/";
+ $call = $this -> callCmd($cmd);
+ $status = $call->[0];
+ my $out = join("\n",@{$call->[2]});
+ $this->logMsg("I",
+ "Called $cmd exit status: <$status> output: $out"
+ );
+ return 1 if $status;
+ }
+ closedir(DH);
+ unlink("$masterpath/comps");
+ }
+
# detached signature
$cmd = "sign -d $masterpath/repodata/repomd.xml";
$call = $this -> callCmd($cmd);
$status = $call->[0];
my $out = join("\n",@{$call->[1]});
$this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
+ return 1 if $status;
# detached pubkey
$cmd = "sign -p $masterpath/repodata/repomd.xml >
$masterpath/repodata/repomd.xml.key";
@@ -267,6 +325,7 @@
$status = $call->[0];
$out = join("\n",@{$call->[1]});
$this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
+ return 1 if $status;
}
return 0;
++++++ product-builder-plugins.obsinfo ++++++
--- /var/tmp/diff_new_pack.P50ecZ/_old 2021-09-20 23:32:12.387103401 +0200
+++ /var/tmp/diff_new_pack.P50ecZ/_new 2021-09-20 23:32:12.387103401 +0200
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.3.1
-mtime: 1618495851
-commit: 76bfae98ffd054182439ee7802e0f10f5108e5a3
+version: 1.4.3
+mtime: 1631878225
+commit: aceff0c4ea5bc78c72514716e90aa45560329330
