Hello community,
here is the log from the commit of package product-builder-plugin-Tumbleweed
for openSUSE:Factory checked in at 2019-02-08 12:06:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old)
and
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Fri Feb 8 12:06:16 2019 rev:13 rq:670146 version:1.1~pre.1548856050.054a6a1
Changes:
--------
---
/work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2018-01-24 15:25:05.525550750 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.28833/product-builder-plugin-Tumbleweed.changes
2019-02-08 12:06:34.149623116 +0100
@@ -1,0 +2,10 @@
+Wed Jan 30 13:56:59 UTC 2019 - Adrian Schröter <[email protected]>
+
+- support multiple product repoid tags
+
+-------------------------------------------------------------------
+Fri Mar 9 14:31:36 UTC 2018 - [email protected]
+
+- add dependency to instsource-susedata for disk usage meta data
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.0~pre.1516716020.44dfdf4.obscpio
New:
----
product-builder-plugins-1.1~pre.1548856050.054a6a1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.PR4Oau/_old 2019-02-08 12:06:40.837620603 +0100
+++ /var/tmp/diff_new_pack.PR4Oau/_new 2019-02-08 12:06:40.837620603 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder-plugin-Tumbleweed
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,15 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: product-builder-plugin-Tumbleweed
Summary: openSUSE - KIWI Image System
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/Management
-Version: 1.0~pre.1516716020.44dfdf4
+Version: 1.1~pre.1548856050.054a6a1
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
@@ -53,8 +53,7 @@
make buildroot="%{buildroot}" version="tumbleweed" install
%files
-%defattr(-, root, root)
-%doc LICENSE
+%license LICENSE
%dir %{_datadir}/kiwi
%dir %{_datadir}/kiwi/modules
%dir %{_datadir}/kiwi/modules/plugins
++++++ _service ++++++
--- /var/tmp/diff_new_pack.PR4Oau/_old 2019-02-08 12:06:40.861620594 +0100
+++ /var/tmp/diff_new_pack.PR4Oau/_new 2019-02-08 12:06:40.861620594 +0100
@@ -5,7 +5,7 @@
<param name="revision">SLE_15</param>
-->
<param name="scm">git</param>
- <param name="versionprefix">1.0~pre</param>
+ <param name="versionprefix">1.1~pre</param>
</service>
<service mode="disabled" name="set_version" />
<service mode="buildtime" name="tar"/>
++++++ product-builder-plugins-1.0~pre.1516716020.44dfdf4.obscpio ->
product-builder-plugins-1.1~pre.1548856050.054a6a1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.0~pre.1516716020.44dfdf4/KIWIDescrPlugin.pm
new/product-builder-plugins-1.1~pre.1548856050.054a6a1/KIWIDescrPlugin.pm
--- old/product-builder-plugins-1.0~pre.1516716020.44dfdf4/KIWIDescrPlugin.pm
2017-09-20 11:50:44.000000000 +0200
+++ new/product-builder-plugins-1.1~pre.1548856050.054a6a1/KIWIDescrPlugin.pm
2019-01-30 14:47:30.000000000 +0100
@@ -169,7 +169,7 @@
my $this = $params[0];
my $paths = $params[1];
my $masterpath = @{$paths}[0];
- my $repoid = $params[2];
+ my $repoids = $params[2];
my $distroname = $params[3];
my $cpeid = $params[4];
my $cmd;
@@ -181,7 +181,9 @@
$cmd .= " --unique-md-filenames";
$cmd .= " --checksum=sha256";
$cmd .= " --no-database";
- $cmd .= " --repo=\"$repoid\"" if $repoid;
+ foreach my $repoid (split(/\s+/, $repoids)) {
+ $cmd .= " --repo=\"$repoid\"";
+ }
$cmd .= " --distro=\"$cpeid,$distroname\"" if $cpeid && $distroname;
if (@{$paths} > 1) {
$cmd .= " --split";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.0~pre.1516716020.44dfdf4/KIWIMiniIsoPlugin.pm
new/product-builder-plugins-1.1~pre.1548856050.054a6a1/KIWIMiniIsoPlugin.pm
--- old/product-builder-plugins-1.0~pre.1516716020.44dfdf4/KIWIMiniIsoPlugin.pm
2018-01-23 15:01:12.000000000 +0100
+++ new/product-builder-plugins-1.1~pre.1548856050.054a6a1/KIWIMiniIsoPlugin.pm
2019-01-30 14:47:30.000000000 +0100
@@ -138,6 +138,7 @@
);
$this -> updateInitRDNET("./etc/linuxrc.d/10_repo",
"defaultrepo=$repoloc\n");
+ $this -> updateInitRDNET("./etc/linuxrc.d/16_instsys",
"instsys=disk:boot/___INITRD_ARCH___/root\n");
my @gfxbootfiles;
find(
@@ -275,11 +276,6 @@
# hardcode for now
$zipper = "xz --check=crc32";
- my ($cpio, $pad) = _makecpiohead($file, [0, 0, oct(644), 1, 0, 0, 0,
length($content), 0, 0, 0]);
- $cpio .= $content;
- $cpio .= $pad if $pad;
- $cpio .= _makecpiohead();
-
my @initrdfiles;
find(
sub { find_cb($this, '.*/initrd$', \@initrdfiles) },
@@ -290,6 +286,18 @@
for my $initrd (@initrdfiles) {
$this -> logMsg("I", "updating $initrd");
+
+ my $iarch = $initrd;
+ $iarch =~ s/.*\/boot\///;
+ $iarch =~ s/\/.*//;
+ my $_content = $content;
+ $_content =~ s/___INITRD_ARCH___/$iarch/g;
+ $this -> logMsg("I", " set parameter: $_content");
+ my ($cpio, $pad) = _makecpiohead($file, [0, 0, oct(644), 1, 0, 0, 0,
length($_content), 0, 0, 0]);
+ $cpio .= $_content;
+ $cpio .= $pad if $pad;
+ $cpio .= _makecpiohead();
+
my $fh = FileHandle -> new();
if (! $fh -> open("|$zipper -c >> $initrd")) {
#if (! $fh -> open(">$initrd.append")) {
++++++ product-builder-plugins.obsinfo ++++++
--- /var/tmp/diff_new_pack.PR4Oau/_old 2019-02-08 12:06:41.089620508 +0100
+++ /var/tmp/diff_new_pack.PR4Oau/_new 2019-02-08 12:06:41.093620507 +0100
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.0~pre.1516716020.44dfdf4
-mtime: 1516716020
-commit: 44dfdf4852a96f99d3ad2d3513fac02bcf40b105
+version: 1.1~pre.1548856050.054a6a1
+mtime: 1548856050
+commit: 054a6a1113d2a45fa56d2d1028c48391b30705bf
