commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2020-09-23 18:37:09
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.4249 (New)
Package is "product-builder"
Wed Sep 23 18:37:09 2020 rev:33 rq:834264 version:1.3.1
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2020-04-27 23:29:14.778453744 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.4249/product-builder.changes
2020-09-23 18:37:26.321161894 +0200
@@ -1,0 +2,7 @@
+Mon Sep 14 09:46:09 UTC 2020 - Adrian Schröter
+
+- 1.3.1
+ * include license information in report files
+(do not use this on OBS 2.10 or before)
+
+---
Old:
product-builder-1.3.0.obscpio
New:
product-builder-1.3.1.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.8NmEA2/_old 2020-09-23 18:37:28.497163790 +0200
+++ /var/tmp/diff_new_pack.8NmEA2/_new 2020-09-23 18:37:28.497163790 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.3.0
+Version:1.3.1
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.8NmEA2/_old 2020-09-23 18:37:28.525163814 +0200
+++ /var/tmp/diff_new_pack.8NmEA2/_new 2020-09-23 18:37:28.529163817 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.3.0
-1.3.0
+1.3.1
+1.3.1
git
rpm/product-builder.spec
++ product-builder-1.3.0.obscpio -> product-builder-1.3.1.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.3.0/modules/KIWICollect.pm
new/product-builder-1.3.1/modules/KIWICollect.pm
--- old/product-builder-1.3.0/modules/KIWICollect.pm2020-04-24
09:55:24.0 +0200
+++ new/product-builder-1.3.1/modules/KIWICollect.pm2020-09-14
11:44:20.0 +0200
@@ -1475,6 +1475,7 @@
"binaryarch" => $pkg->{arch},
"buildtime" => $pkg->{buildtime},
"disturl"=> $pkg->{disturl},
+"license"=> $pkg->{license},
"localfile" => $pkg->{repo}->{origin}.substr(
$pkg->{localfile}, length($pkg->{repo}->{source})
)
@@ -1814,6 +1815,7 @@
'NOSOURCE',
'NOPATCH',
'DISTURL',
+'LICENSE',
'BUILDTIME',
'PROVIDENAME',
'PROVIDEVERSION',
@@ -1845,6 +1847,7 @@
$package->{'repo'} = $this->{m_repos}->{$r};
$package->{'localfile'} = $uri;
$package->{'disturl'} = $flags{'DISTURL'}[0];
+$package->{'license'} = $flags{'LICENSE'}[0];
$package->{'epoch'} = $flags{'EPOCH'}[0];
$package->{'version'} = $flags{'VERSION'}[0];
$package->{'release'} = $flags{'RELEASE'}[0];
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.8NmEA2/_old 2020-09-23 18:37:28.693163960 +0200
+++ /var/tmp/diff_new_pack.8NmEA2/_new 2020-09-23 18:37:28.697163964 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.3.0
-mtime: 1587714924
-commit: cadfc00c5e34f1ba0772a67e27721b8777d3777f
+version: 1.3.1
+mtime: 1600076660
+commit: df266e68b3e36293bd3bf0b2e26a1790feb19ddd
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2020-04-27 23:29:08
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.2738 (New)
Package is "product-builder"
Mon Apr 27 23:29:08 2020 rev:32 rq:797196 version:1.3.0
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2020-04-16 22:59:51.575519437 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.2738/product-builder.changes
2020-04-27 23:29:14.778453744 +0200
@@ -1,0 +2,6 @@
+Tue Apr 21 14:40:56 UTC 2020 - Adrian Schröter
+
+- 1.3.0
+ * fail when plugins fail
+
+---
Old:
product-builder-1.2.10.obscpio
New:
product-builder-1.3.0.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.NyQffA/_old 2020-04-27 23:29:17.126458328 +0200
+++ /var/tmp/diff_new_pack.NyQffA/_new 2020-04-27 23:29:17.126458328 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.10
+Version:1.3.0
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.NyQffA/_old 2020-04-27 23:29:17.150458374 +0200
+++ /var/tmp/diff_new_pack.NyQffA/_new 2020-04-27 23:29:17.150458374 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.10
-1.2.10
+1.3.0
+1.3.0
git
rpm/product-builder.spec
++ product-builder-1.2.10.obscpio -> product-builder-1.3.0.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.10/modules/KIWICollect.pm
new/product-builder-1.3.0/modules/KIWICollect.pm
--- old/product-builder-1.2.10/modules/KIWICollect.pm 2020-04-15
16:25:04.0 +0200
+++ new/product-builder-1.3.0/modules/KIWICollect.pm2020-04-24
09:55:24.0 +0200
@@ -2261,7 +2261,10 @@
foreach my $order(sort {$a <=> $b}
keys(%{$this->{m_metacreator}->{m_handlers}})) {
if($this->{m_metacreator}->{m_handlers}->{$order}->ready()) {
$this->logMsg('I', "Execute plugin
".$this->{m_metacreator}->{m_handlers}->{$order}->name()." order $order");
-$this->{m_metacreator}->{m_handlers}->{$order}->execute();
+if ($this->{m_metacreator}->{m_handlers}->{$order}->execute()) {
+ $this->logMsg('E', 'Plugin failed!');
+ return;
+}
} else {
$this->logMsg(
"W", "Plugin
".$this->{m_metacreator}->{m_handlers}->{$order}->name()." is not activated
yet!"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.10/modules/KIWIIsoLinux.pm
new/product-builder-1.3.0/modules/KIWIIsoLinux.pm
--- old/product-builder-1.2.10/modules/KIWIIsoLinux.pm 2020-04-15
16:25:04.0 +0200
+++ new/product-builder-1.3.0/modules/KIWIIsoLinux.pm 2020-04-24
09:55:24.0 +0200
@@ -445,7 +445,7 @@
my $boot = $base{$arch}{boot};
my $volid = $this -> createVolumeID();
-#$para.= " -chrp-boot"; # should not be needed anymore
+$para.= " -chrp-boot";
$para.= " -hfs-bless $src/$boot/grub2-ieee1275";
$para.= " -hfs-volid '$volid'";
$para.= " -l";
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.NyQffA/_old 2020-04-27 23:29:17.278458624 +0200
+++ /var/tmp/diff_new_pack.NyQffA/_new 2020-04-27 23:29:17.278458624 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.10
-mtime: 1586960704
-commit: e0a5d1c56acab2050ecbfdc3d7513e07a8a3fc11
+version: 1.3.0
+mtime: 1587714924
+commit: cadfc00c5e34f1ba0772a67e27721b8777d3777f
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2020-04-16 22:59:48
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.2738 (New)
Package is "product-builder"
Thu Apr 16 22:59:48 2020 rev:31 rq:794217 version:1.2.10
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2020-03-11 18:32:08.918891390 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder.new.2738/product-builder.changes
2020-04-16 22:59:51.575519437 +0200
@@ -1,0 +2,6 @@
+Wed Apr 15 14:37:41 UTC 2020 - Adrian Schröter
+
+- 1.2.10
+ * disable -chrp-boot option for ppc64le (bsc#1169420)
+
+---
Old:
product-builder-1.2.9.obscpio
New:
product-builder-1.2.10.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.DJ8hy9/_old 2020-04-16 22:59:52.111519841 +0200
+++ /var/tmp/diff_new_pack.DJ8hy9/_new 2020-04-16 22:59:52.115519844 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.9
+Version:1.2.10
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.DJ8hy9/_old 2020-04-16 22:59:52.139519862 +0200
+++ /var/tmp/diff_new_pack.DJ8hy9/_new 2020-04-16 22:59:52.143519865 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.9
-1.2.9
+1.2.10
+1.2.10
git
rpm/product-builder.spec
++ product-builder-1.2.9.obscpio -> product-builder-1.2.10.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.9/modules/KIWIIsoLinux.pm
new/product-builder-1.2.10/modules/KIWIIsoLinux.pm
--- old/product-builder-1.2.9/modules/KIWIIsoLinux.pm 2020-02-28
11:09:58.0 +0100
+++ new/product-builder-1.2.10/modules/KIWIIsoLinux.pm 2020-04-15
16:25:04.0 +0200
@@ -445,7 +445,7 @@
my $boot = $base{$arch}{boot};
my $volid = $this -> createVolumeID();
-$para.= " -chrp-boot";
+#$para.= " -chrp-boot"; # should not be needed anymore
$para.= " -hfs-bless $src/$boot/grub2-ieee1275";
$para.= " -hfs-volid '$volid'";
$para.= " -l";
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.DJ8hy9/_old 2020-04-16 22:59:52.299519982 +0200
+++ /var/tmp/diff_new_pack.DJ8hy9/_new 2020-04-16 22:59:52.299519982 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.9
-mtime: 1582884598
-commit: ea6316a55b185c14a6b04c347b1b463f211d3fc7
+version: 1.2.10
+mtime: 1586960704
+commit: e0a5d1c56acab2050ecbfdc3d7513e07a8a3fc11
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2020-03-11 18:32:06
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.3160 (New)
Package is "product-builder"
Wed Mar 11 18:32:06 2020 rev:30 rq:782084 version:1.2.9
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2020-02-14 16:26:24.915224545 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder.new.3160/product-builder.changes
2020-03-11 18:32:08.918891390 +0100
@@ -1,0 +2,12 @@
+Fri Feb 28 11:02:19 UTC 2020 - Adrian Schröter
+
+- 1.2.9
+ * fix "multiple kiwi files" error for Full media
+
+---
+Wed Feb 26 13:23:16 UTC 2020 - Adrian Schröter
+
+- 1.2.8
+ * keep kwd file in SLE Full media wrapper (bsc#1164670)
+
+---
Old:
product-builder-1.2.7.obscpio
New:
product-builder-1.2.9.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.RRhxYy/_old 2020-03-11 18:32:12.002893282 +0100
+++ /var/tmp/diff_new_pack.RRhxYy/_new 2020-03-11 18:32:12.014893289 +0100
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.7
+Version:1.2.9
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.RRhxYy/_old 2020-03-11 18:32:12.042893306 +0100
+++ /var/tmp/diff_new_pack.RRhxYy/_new 2020-03-11 18:32:12.046893308 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.7
-1.2.7
+1.2.9
+1.2.9
git
rpm/product-builder.spec
++ product-builder-1.2.7.obscpio -> product-builder-1.2.9.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.7/SLE-wrapper.sh
new/product-builder-1.2.9/SLE-wrapper.sh
--- old/product-builder-1.2.7/SLE-wrapper.sh2020-02-05 13:05:47.0
+0100
+++ new/product-builder-1.2.9/SLE-wrapper.sh2020-02-28 11:09:58.0
+0100
@@ -33,6 +33,9 @@
perl -e '$in=0; while () { $in=1 if / config.xml
sed -i
"s,MEDIUM_NAME\">.*,MEDIUM_NAME\">$MN-$BUILD_SUFFIX-Media$MN-$BUILD_SUFFIX," config.xml
+ # rescue support flags
+ cp ${kiwi%.kiwi}.kwd config.kwd
+
/usr/bin/product-builder.pl --root $TOPDIR/KIWIROOT/ -v 1 --logfile
terminal --create-instsource . || exit 1
mv $TOPDIR/KIWIROOT/main $TOPDIR/KIWIALL/$MN_SHORT
rm -rf $TOPDIR/KIWIROOT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.7/modules/KIWICollect.pm
new/product-builder-1.2.9/modules/KIWICollect.pm
--- old/product-builder-1.2.7/modules/KIWICollect.pm2020-02-05
13:05:47.0 +0100
+++ new/product-builder-1.2.9/modules/KIWICollect.pm2020-02-28
11:09:58.0 +0100
@@ -1349,6 +1349,7 @@
my %supporthash;
my $supportfile = abs_path($this->{m_xml}->{xmlOrigFile});
$supportfile =~ s/.kiwi$/.kwd/;
+$supportfile =~ s/.xml$/.kwd/;
if ( -e $supportfile ) {
my $support_fd = FileHandle -> new();
if (! $support_fd -> open ($supportfile)) {
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.RRhxYy/_old 2020-03-11 18:32:12.166893382 +0100
+++ /var/tmp/diff_new_pack.RRhxYy/_new 2020-03-11 18:32:12.170893385 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.7
-mtime: 1580904347
-commit: 2fa0d07906bffbde3df7cef265301ecd08d85027
+version: 1.2.9
+mtime: 1582884598
+commit: ea6316a55b185c14a6b04c347b1b463f211d3fc7
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2020-02-14 16:26:18
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.26092 (New)
Package is "product-builder"
Fri Feb 14 16:26:18 2020 rev:29 rq:770240 version:1.2.7
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2019-09-25 01:33:22.949683186 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.26092/product-builder.changes
2020-02-14 16:26:24.915224545 +0100
@@ -1,0 +2,12 @@
+Wed Feb 5 12:06:04 UTC 2020 - Adrian Schröter
+
+- 1.2.7
+ * Fix possible partition misallignment (bsc#1162531)
+
+---
+Thu Dec 12 11:07:17 UTC 2019 - Frederic Crozat
+
+- 1.2.6
+ * Fix SLE wrapper for new Package DVD name.
+
+---
Old:
product-builder-1.2.5.obscpio
New:
product-builder-1.2.7.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.gRUo4M/_old 2020-02-14 16:26:27.031225693 +0100
+++ /var/tmp/diff_new_pack.gRUo4M/_new 2020-02-14 16:26:27.071225715 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Summary:SUSE Product Builder
License:GPL-2.0-only
Group: System/Management
-Url:http://github.com/openSUSE/product-builder
+URL:http://github.com/openSUSE/product-builder
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.5
+Version:1.2.7
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.gRUo4M/_old 2020-02-14 16:26:27.203225786 +0100
+++ /var/tmp/diff_new_pack.gRUo4M/_new 2020-02-14 16:26:27.203225786 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.5
-1.2.5
+1.2.7
+1.2.7
git
rpm/product-builder.spec
++ product-builder-1.2.5.obscpio -> product-builder-1.2.7.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.5/SLE-wrapper.sh
new/product-builder-1.2.7/SLE-wrapper.sh
--- old/product-builder-1.2.5/SLE-wrapper.sh2019-09-18 13:03:17.0
+0200
+++ new/product-builder-1.2.7/SLE-wrapper.sh2020-02-05 13:05:47.0
+0100
@@ -1,11 +1,11 @@
#!/bin/bash
-# wrapper around product builder to call itself recursive for SLE Packages DVD
+# wrapper around product builder to call itself recursive for SLE Full image
set -xe
case "$BUILD_FLAVOR" in
- SLES-cd-Packages-DVD-*)
+ SLES-cd-Full-*)
TOPDIR=/usr/src/packages/
cd $TOPDIR/SOURCES/ || exit 1
mkdir $TOPDIR/KIWIRESULTS
@@ -13,7 +13,7 @@
# remove symlink, we cat into it
rm config.xml
-ARCH=${BUILD_FLAVOR/SLES-cd-Packages-DVD-}
+ARCH=${BUILD_FLAVOR/SLES-cd-Full-}
# the worker expands obsrepositories:// only in the target kiwi so we need
to apply this change to the modules
perl -e '$in=0; while () { $in=1 if / expanded_instsources.include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.5/modules/KIWIIsoLinux.pm
new/product-builder-1.2.7/modules/KIWIIsoLinux.pm
--- old/product-builder-1.2.5/modules/KIWIIsoLinux.pm 2019-09-18
13:03:17.0 +0200
+++ new/product-builder-1.2.7/modules/KIWIIsoLinux.pm 2020-02-05
13:05:47.0 +0100
@@ -319,6 +319,7 @@
#--
KIWIQX::qxx ("echo $magicID > ".$this->{tmpdir}."/glump");
KIWIQX::qxx ("echo ".$this->{tmpdir}."/glump 100 >> $sort") if $sort;
+$para.= " -hide glump -hide-joliet glump";
$para.= " -sort $sort" if $sort;
$para.= " -eltorito-alt-boot";
$para.= " -eltorito-platform efi";
@@ -473,6 +474,7 @@
#--
KIWIQX::qxx ("echo $magicID > ".$this->{tmpdir}."/glump");
KIWIQX::qxx ("echo ".$this->{tmpdir}."/glump 100 >> $sort") if $sort;
+$para.= " -hide glump -hide-joliet glump";
$para.= " -sort $sort" if $sort;
$para.= " -no-emul-boot";
# do not add -boot-load-size 1 here
@@ -882,7 +884,6 @@
my $cmdL = $this -> {cmdL};
my $xml = $this ->
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2019-09-25 01:33:19
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.7948 (New)
Package is "product-builder"
Wed Sep 25 01:33:19 2019 rev:28 rq:731719 version:1.2.5
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2019-09-17 13:36:54.709847616 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.7948/product-builder.changes
2019-09-25 01:33:22.949683186 +0200
@@ -1,0 +2,6 @@
+Wed Sep 18 11:06:05 UTC 2019 - Stephan Kulow
+
+- 1.2.5
+ * Fix SLE wrapper to take the proper architecture for packages DVD
(jsc#SLE-8271)
+
+---
Old:
product-builder-1.2.4.obscpio
New:
product-builder-1.2.5.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.GtzKsu/_old 2019-09-25 01:33:23.741683089 +0200
+++ /var/tmp/diff_new_pack.GtzKsu/_new 2019-09-25 01:33:23.745683088 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.4
+Version:1.2.5
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.GtzKsu/_old 2019-09-25 01:33:23.769683086 +0200
+++ /var/tmp/diff_new_pack.GtzKsu/_new 2019-09-25 01:33:23.769683086 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.4
-1.2.4
+1.2.5
+1.2.5
git
rpm/product-builder.spec
++ product-builder-1.2.4.obscpio -> product-builder-1.2.5.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.4/SLE-wrapper.sh
new/product-builder-1.2.5/SLE-wrapper.sh
--- old/product-builder-1.2.4/SLE-wrapper.sh2019-09-16 08:37:02.0
+0200
+++ new/product-builder-1.2.5/SLE-wrapper.sh2019-09-18 13:03:17.0
+0200
@@ -39,7 +39,7 @@
done # kiwiconf
# now the final ISO
-perl -e '$in=0; while () { $in=0 if m,
config.xml
+perl -e '$in=0; while () { $in=0 if m, config.xml
;;
esac
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.GtzKsu/_old 2019-09-25 01:33:23.961683062 +0200
+++ /var/tmp/diff_new_pack.GtzKsu/_new 2019-09-25 01:33:23.961683062 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.4
-mtime: 1568615822
-commit: ad6f455bc44b150eb916663ed8cff74fae455c94
+version: 1.2.5
+mtime: 1568804597
+commit: 3977b33e4bb79b990b80976291c3e4717589991e
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2019-09-17 13:36:53
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.7948 (New)
Package is "product-builder"
Tue Sep 17 13:36:53 2019 rev:27 rq:731197 version:1.2.4
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2019-07-21 11:29:32.152826040 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.7948/product-builder.changes
2019-09-17 13:36:54.709847616 +0200
@@ -1,0 +2,14 @@
+Mon Sep 16 08:32:26 UTC 2019 - Stephan Kulow
+
+- 1.2.4
+ * add SLE wrapper to prepare modules for packages dvd (jsc#SLE-8271)
+ * smaller perl fixes
+
+---
+Fri Sep 13 06:08:31 UTC 2019 - Adrian Schröter
+
+- 1.2.3
+ handle multiple packages with same name but different version/release in one
repo.
+ bsc#1150238
+
+---
Old:
product-builder-1.2.2.obscpio
New:
product-builder-1.2.4.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.kDpPIR/_old 2019-09-17 13:36:55.113847552 +0200
+++ /var/tmp/diff_new_pack.kDpPIR/_new 2019-09-17 13:36:55.117847551 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.2
+Version:1.2.4
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
@@ -62,7 +62,7 @@
%build
test -e /.buildenv && . /.buildenv
-make buildroot="%{buildroot}" CFLAGS="%{optflags}"
+make CFLAGS="%{optflags}"
%install
make buildroot="%{buildroot}" \
@@ -71,6 +71,14 @@
install
./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
+%if 0%{?is_opensuse}
+mv %{buildroot}%{_bindir}/product-builder{.pl,}
+%else
+# install SLE wrapper as entry point. It doesn't really harm as the
+# build flavor detected is very specific, but to avoid waste...
+ln -s product-builder-sle.sh %{buildroot}%{_bindir}/product-builder
+%endif
+
%files
%dir %{_datadir}/kiwi
%license LICENSE
@@ -78,6 +86,6 @@
%{_datadir}/kiwi/metadata
%{_datadir}/kiwi/modules
%{_datadir}/kiwi/xsl
-%{_bindir}/product-builder
+%{_bindir}/product-builder*
%changelog
++ _service ++
--- /var/tmp/diff_new_pack.kDpPIR/_old 2019-09-17 13:36:55.141847547 +0200
+++ /var/tmp/diff_new_pack.kDpPIR/_new 2019-09-17 13:36:55.141847547 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.2
-1.2.2
+1.2.4
+1.2.4
git
rpm/product-builder.spec
++ product-builder-1.2.2.obscpio -> product-builder-1.2.4.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.2/Makefile
new/product-builder-1.2.4/Makefile
--- old/product-builder-1.2.2/Makefile 2019-07-16 13:15:40.0 +0200
+++ new/product-builder-1.2.4/Makefile 2019-09-16 08:37:02.0 +0200
@@ -34,7 +34,8 @@
#
# Install KIWI base and modules
#
- install -m 755 ./product-builder.pl ${KIWIBINVZ}/product-builder
+ install -m 755 ./product-builder.pl ${KIWIBINVZ}/product-builder.pl
+ install -m 755 ./SLE-wrapper.sh ${KIWIBINVZ}/product-builder-sle.sh
install -m 644 ./xsl/* ${KIWIXSLVZ}
for i in $(shell find modules -type f | grep -v -E '\.test');do \
install -m 644 $$i ${KIWIMODVZ} ;\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.2/SLE-wrapper.sh
new/product-builder-1.2.4/SLE-wrapper.sh
--- old/product-builder-1.2.2/SLE-wrapper.sh1970-01-01 01:00:00.0
+0100
+++ new/product-builder-1.2.4/SLE-wrapper.sh2019-09-16 08:37:02.0
+0200
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# wrapper around product builder to call itself recursive for SLE Packages DVD
+
+set -xe
+
+case "$BUILD_FLAVOR" in
+ SLES-cd-Packages-DVD-*)
+TOPDIR=/usr/src/packages/
+cd $TOPDIR/SOURCES/ || exit 1
+mkdir $TOPDIR/KIWIRESULTS
+
+# remove symlink, we cat into it
+rm config.xml
+
+ARCH=${BUILD_FLAVOR/SLES-cd-Packages-DVD-}
+# the worker expands obsrepositories:// only in the target kiwi so we need
to apply this change to the modules
+perl -e '$in=0; while () { $in=1 if / expanded_instsources.include
+
+# map the build number to the modules
+BUILD_SUFFIX=`sed -ne
"s/.*name=\"MEDIUM_NAME\">.*-$ARCH-\([^<]*\)-Media<.*/\1/p"
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2019-07-21 11:29:30
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.4126 (New)
Package is "product-builder"
Sun Jul 21 11:29:30 2019 rev:26 rq:715659 version:1.2.2
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2019-03-05 12:16:58.976994569 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder.new.4126/product-builder.changes
2019-07-21 11:29:32.152826040 +0200
@@ -1,0 +2,6 @@
+Tue Jul 16 07:38:10 UTC 2019 - Adrian Schröter
+
+- 1.2.2
+ * track provided cpeid of products
+
+---
Old:
product-builder-1.2.1.obscpio
New:
product-builder-1.2.2.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.qnqmok/_old 2019-07-21 11:29:32.756825938 +0200
+++ /var/tmp/diff_new_pack.qnqmok/_new 2019-07-21 11:29:32.764825937 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.1
+Version:1.2.2
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.qnqmok/_old 2019-07-21 11:29:32.792825932 +0200
+++ /var/tmp/diff_new_pack.qnqmok/_new 2019-07-21 11:29:32.796825932 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.1
-1.2.1
+1.2.2
+1.2.2
git
rpm/product-builder.spec
++ product-builder-1.2.1.obscpio -> product-builder-1.2.2.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.1/modules/KIWICollect.pm
new/product-builder-1.2.2/modules/KIWICollect.pm
--- old/product-builder-1.2.1/modules/KIWICollect.pm2019-01-16
15:41:37.0 +0100
+++ new/product-builder-1.2.2/modules/KIWICollect.pm2019-07-16
13:15:40.0 +0200
@@ -1478,6 +1478,9 @@
$pkg->{localfile}, length($pkg->{repo}->{source})
)
);
+if (defined($pkg->{cpeid}) && $pkg->{cpeid} ne "") {
+$hash{"cpeid"} = $pkg->{cpeid};
+}
if (defined($pkg->{epoch}) && $pkg->{epoch} ne "") {
$hash{"epoch"} = $pkg->{epoch};
}
@@ -1826,7 +1829,6 @@
$store = {};
$packPool->{$name} = $store;
}
-$store->{$repokey} = $package;
# look for products defined inside
RPMQ::rpmq_add_flagsvers(\%flags, 'PROVIDENAME',
'PROVIDEFLAGS', 'PROVIDEVERSION');
for my $provide (@{$flags{'PROVIDENAME'} || []}) {
@@ -1834,7 +1836,13 @@
$this->logMsg('I', "Found product provides for
$1");
push @$productList, $1;
}
+ if ($provide =~ /^product-cpeid\(\) = (.+)$/) {
+$package->{'cpeid'} = $1;
+$package->{'cpeid'} =~
s/%([a-fA-F0-9]{2})/chr(hex($1))/sge;
+$this->logMsg('I', "Found cpeid provides for
$package->{'cpeid'}");
+ }
}
+$store->{$repokey} = $package;
$retval++;
} # read RPM header
} # foreach URI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.1/product-builder
new/product-builder-1.2.2/product-builder
--- old/product-builder-1.2.1/product-builder 2019-01-16 15:41:37.0
+0100
+++ new/product-builder-1.2.2/product-builder 2019-07-16 13:15:40.0
+0200
@@ -21,7 +21,7 @@
EOF
fi
-./product-builder.pl $@
+./product-builder.pl "$@"
ecode=$?
popd $callpath &>/dev/null
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.qnqmok/_old 2019-07-21 11:29:32.992825899 +0200
+++ /var/tmp/diff_new_pack.qnqmok/_new 2019-07-21 11:29:32.992825899 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.1
-mtime: 1547649697
-commit: 0682d806bcf6ea2a61b04ce10ad60b3c8149155f
+version: 1.2.2
+mtime: 1563275740
+commit: fa39a2b5a3f8bd27117afa9bca71b8512c1a77ca
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2019-03-05 12:16:54
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.28833 (New)
Package is "product-builder"
Tue Mar 5 12:16:54 2019 rev:25 rq:679575 version:1.2.1
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-09-11 17:10:36.876029891 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.28833/product-builder.changes
2019-03-05 12:16:58.976994569 +0100
@@ -1,0 +2,6 @@
+Wed Jan 16 14:46:43 UTC 2019 - Adrian Schröter
+
+- 1.2.1
+ * Use RPi hybrid mode on aarch64 always (no config needed anymore)
+
+---
Old:
product-builder-1.2.0.obscpio
New:
product-builder-1.2.1.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.gzeSOo/_old 2019-03-05 12:16:59.888994286 +0100
+++ /var/tmp/diff_new_pack.gzeSOo/_new 2019-03-05 12:16:59.892994284 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# 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
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.0
+Version:1.2.1
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.gzeSOo/_old 2019-03-05 12:16:59.912994278 +0100
+++ /var/tmp/diff_new_pack.gzeSOo/_new 2019-03-05 12:16:59.916994277 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.0
-1.2.0
+1.2.1
+1.2.1
git
rpm/product-builder.spec
++ product-builder-1.2.0.obscpio -> product-builder-1.2.1.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.0/modules/KIWICollect.pm
new/product-builder-1.2.1/modules/KIWICollect.pm
--- old/product-builder-1.2.0/modules/KIWICollect.pm2018-08-24
15:08:40.0 +0200
+++ new/product-builder-1.2.1/modules/KIWICollect.pm2019-01-16
15:41:37.0 +0100
@@ -751,97 +751,96 @@
"Module KIWIIsoLinux not loadable: $@"
);
return 1;
-} else {
-my $iso;
-for my $cd ($this->getMediaNumbers()) {
-if ( $cd == 0 ) {
-next;
-}
-( my $name = $this->{m_basesubdir}->{$cd} ) =~ s{.*/(.*)/*$}{$1};
-my $isoname = $this->{m_united}."/$name.iso";
-# construct volume id, no longer than 32 bytes allowed
-my $volid_maxlen = 32;
-my $vname = $name;
-$vname =~ s/-Media//;
-$vname =~ s/-Build// if length($vname) > ($volid_maxlen - 4);
-my $vid = substr($vname,0,($volid_maxlen));
-if ($this->{m_proddata}->getVar("MULTIPLE_MEDIA", "true") eq
"true") {
-$vid = sprintf(
-"%s.%03d",
-substr($vname,0,($volid_maxlen - 4)), $cd
-);
-}
-my $attr = "-r"; # RockRidge
-$attr .= " -pad"; # pad image by 150 sectors - needed for Linux
-$attr .= " -f"; # follow symlinks - really necessary?
-$attr .= " -J"; # Joilet extensions - only useful for i586/x86_64,
-$attr .= " -joliet-long"; # longer filenames for joilet filenames
-$attr .= " -p \"$this->{gdata}->{Preparer}\"";
-$attr .= " -publisher \"$this->{gdata}->{Publisher}\"";
-$attr .= " -A \"$name\"";
-$attr .= " -V \"$vid\"";
-my $checkmedia = '';
-if ( defined($this->{m_proddata}->getVar("RUN_MEDIA_CHECK"))
-&& $this->{m_proddata}->getVar("RUN_MEDIA_CHECK") ne "false"
-) {
-$checkmedia = "checkmedia";
-}
-my $hybridmedia;
-my $rpihybridmedia;
-if (defined($this->{m_proddata}->getVar("RUN_ISOHYBRID"))) {
-$hybridmedia = 1 if
$this->{m_proddata}->getVar("RUN_ISOHYBRID") eq "true";
-$rpihybridmedia = 1 if
$this->{m_proddata}->getVar("RUN_ISOHYBRID") eq "rpi"
-}
-$iso = KIWIIsoLinux -> new(
-$this->{m_basesubdir}->{$cd},
-$isoname, $attr, $checkmedia, $this->{cmdL}, $this->{m_xml}
+
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-09-11 17:10:32
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Tue Sep 11 17:10:32 2018 rev:24 rq:631391 version:1.2.0
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-06-08 23:20:08.293936992 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-09-11 17:10:36.876029891 +0200
@@ -1,0 +2,6 @@
+Fri Aug 24 12:36:16 UTC 2018 - Adrian Schröter
+
+- 1.2.0
+ * Add special RPi hybrid mode
+
+---
Old:
product-builder-1.1.3.obscpio
New:
product-builder-1.2.0.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.ueuNXF/_old 2018-09-11 17:10:37.532028870 +0200
+++ /var/tmp/diff_new_pack.ueuNXF/_new 2018-09-11 17:10:37.532028870 +0200
@@ -12,7 +12,7 @@
# 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/
#
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.1.3
+Version:1.2.0
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.ueuNXF/_old 2018-09-11 17:10:37.556028833 +0200
+++ /var/tmp/diff_new_pack.ueuNXF/_new 2018-09-11 17:10:37.556028833 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.1.3
-1.1.3
+1.2.0
+1.2.0
git
rpm/product-builder.spec
++ product-builder-1.1.3.obscpio -> product-builder-1.2.0.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.1.3/modules/KIWICollect.pm
new/product-builder-1.2.0/modules/KIWICollect.pm
--- old/product-builder-1.1.3/modules/KIWICollect.pm2018-06-06
10:52:39.0 +0200
+++ new/product-builder-1.2.0/modules/KIWICollect.pm2018-08-24
15:08:40.0 +0200
@@ -787,10 +787,10 @@
$checkmedia = "checkmedia";
}
my $hybridmedia;
-if ( defined($this->{m_proddata}->getVar("RUN_ISOHYBRID"))
-&& $this->{m_proddata}->getVar("RUN_ISOHYBRID") eq "true"
-) {
-$hybridmedia = 1 ;
+my $rpihybridmedia;
+if (defined($this->{m_proddata}->getVar("RUN_ISOHYBRID"))) {
+$hybridmedia = 1 if
$this->{m_proddata}->getVar("RUN_ISOHYBRID") eq "true";
+$rpihybridmedia = 1 if
$this->{m_proddata}->getVar("RUN_ISOHYBRID") eq "rpi"
}
$iso = KIWIIsoLinux -> new(
$this->{m_basesubdir}->{$cd},
@@ -828,6 +828,13 @@
$this->logMsg('I', "Isohybrid call successful");
}
}
+if ($rpihybridmedia) {
+if(!$iso->createRPiHybrid()) {
+$this->logMsg('W', "Failed to create RPi Hybrid ISO");
+} else {
+$this->logMsg('I', "Successfully created RPi Hybrid
ISO");
+}
+}
}
if(!$iso->checkImage()) {
$this->logMsg('E', "Tagmedia call failed");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.1.3/modules/KIWIIsoLinux.pm
new/product-builder-1.2.0/modules/KIWIIsoLinux.pm
--- old/product-builder-1.1.3/modules/KIWIIsoLinux.pm 2018-06-06
10:52:39.0 +0200
+++ new/product-builder-1.2.0/modules/KIWIIsoLinux.pm 2018-08-24
15:08:40.0 +0200
@@ -461,8 +461,18 @@
my $arch = shift;
my %base = %{$this->{base}};
my $para = $this -> {params};
+my $magicID= $this -> {magicID};
my $boot = $base{$arch}{boot};
my $loader= $base{$arch}{efi};
+my $sort = $this -> createLegacySortFile ("aarch64");
+my $src = $this -> {source};
+KIWIQX::qxx ("echo $src/boot/$arch/efi 101 >> $sort");
+#==
+# add end-of-header marker
+#--
+KIWIQX::qxx ("echo $magicID > ".$this->{tmpdir}."/glump");
+KIWIQX::qxx ("echo ".$this->{tmpdir}."/glump 100 >> $sort") if $sort;
+$para.= " -sort $sort" if $sort;
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-06-08 23:20:04
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Fri Jun 8 23:20:04 2018 rev:23 rq:614497 version:1.1.3
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-06-04 13:23:48.969794846 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-06-08 23:20:08.293936992 +0200
@@ -1,0 +2,30 @@
+Wed Jun 6 08:57:09 UTC 2018 - adr...@suse.de
+
+- 1.1.3
+ * Another fix needed for hybrid media on x86_64
+
+---
+Tue Jun 5 12:46:51 UTC 2018 - adr...@suse.de
+
+- 1.1.2
+ * Do not generate Apple partion on ppc64le anymore
+ * Allow to build medias without meta packages again
+
+---
+Mon Jun 4 13:35:16 UTC 2018 - adr...@suse.de
+
+- 1.1.1
+ * fix EFI boot sort order
+- drop factory skelcd hack (accept_old_meta_package.patch)
+
+---
+Tue May 29 15:04:31 UTC 2018 - adr...@suse.de
+
+- 1.1.0
+ * fixed handling of metapackages with multiple lines for one package
+filtered via required architecture
+ * execute mk_listings when configured (bsc#1094929)
+ + drop promo / live boot code
+ * Add riscv64 architecture
+
+---
Old:
accept_old_meta_package.patch
product-builder-1.0.9.obscpio
New:
product-builder-1.1.3.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.bQVa4v/_old 2018-06-08 23:20:09.517892776 +0200
+++ /var/tmp/diff_new_pack.bQVa4v/_new 2018-06-08 23:20:09.521892631 +0200
@@ -23,12 +23,10 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0.9
+Version:1.1.3
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
-# temporary hack for openSUSE:Factory only
-Patch1: accept_old_meta_package.patch
Requires: libxslt
Requires: perl >= %{perl_version}
@@ -61,9 +59,6 @@
%prep
%setup -q
-%if 0%{?skelcd_compat}
-%patch1 -p1
-%endif
%build
test -e /.buildenv && . /.buildenv
@@ -77,9 +72,8 @@
./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
%files
-%defattr(-, root, root)
%dir %{_datadir}/kiwi
-%doc LICENSE
+%license LICENSE
%{_datadir}/kiwi/.revision
%{_datadir}/kiwi/metadata
%{_datadir}/kiwi/modules
++ _service ++
--- /var/tmp/diff_new_pack.bQVa4v/_old 2018-06-08 23:20:09.557891331 +0200
+++ /var/tmp/diff_new_pack.bQVa4v/_new 2018-06-08 23:20:09.557891331 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0.9
-1.0.9
+1.1.3
+1.1.3
git
rpm/product-builder.spec
++ product-builder-1.0.9.obscpio -> product-builder-1.1.3.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.9/modules/KIWICollect.pm
new/product-builder-1.1.3/modules/KIWICollect.pm
--- old/product-builder-1.0.9/modules/KIWICollect.pm2018-04-24
18:21:20.0 +0200
+++ new/product-builder-1.1.3/modules/KIWICollect.pm2018-06-06
10:52:39.0 +0200
@@ -396,14 +396,12 @@
$attr{source}= $package -> getSourceLocation();
$attr{script}= $package -> getScriptPath();
$attr{medium}= $package -> getMediaID();
-$metaPacks{$name} = \%attr;
+push @{$this->{m_metaPacks}{$name}}, \%attr;
}
-%{$this->{m_metaPacks}} = %metaPacks;
if(!$this->{m_metaPacks}) {
my $msg = 'KIWICollect::Init: getProductMetaPackages '
. 'returned no information, no metadata specified.';
-$this->logMsg('E', $msg);
-return;
+$this->logMsg('I', $msg);
} else {
$this->logMsg('I', "KIWICollect::Init: retrieved metapackage list.");
if($this->{m_debug}) {
@@ -806,19 +804,6 @@
. 'not be bootable';
$this->logMsg('W', $msg);
} else {
-my $firmware = 'bios';
-my $xmlFirmWare = $this->{m_xml}
--> getImageType() -> getFirmwareType();
-if ($xmlFirmWare) {
-$firmware = $xmlFirmWare;
-}
-if ($firmware eq "efi" || $firmware eq "uefi") {
-my @archs =
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-06-04 13:22:50
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Mon Jun 4 13:22:50 2018 rev:22 rq: version:1.0.9
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-06-02 11:48:18.112464878 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-06-04 13:23:48.969794846 +0200
@@ -2,10 +1,0 @@
-Tue May 29 15:04:31 UTC 2018 - adr...@suse.de
-
-- 1.1.0
- * fixed handling of metapackages with multiple lines for one package
-filtered via required architecture
- * execute mk_listings when configured (bsc#1094929)
- + drop promo / live boot code
- * Add riscv64 architecture
-
Old:
product-builder-1.1.0.obscpio
New:
product-builder-1.0.9.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.PBqT8n/_old 2018-06-04 13:23:49.881761450 +0200
+++ /var/tmp/diff_new_pack.PBqT8n/_new 2018-06-04 13:23:49.885761304 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.1.0
+Version:1.0.9
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.PBqT8n/_old 2018-06-04 13:23:49.917760132 +0200
+++ /var/tmp/diff_new_pack.PBqT8n/_new 2018-06-04 13:23:49.921759986 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.1.0
-1.1.0
+1.0.9
+1.0.9
git
rpm/product-builder.spec
++ product-builder-1.1.0.obscpio -> product-builder-1.0.9.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.1.0/modules/KIWICollect.pm
new/product-builder-1.0.9/modules/KIWICollect.pm
--- old/product-builder-1.1.0/modules/KIWICollect.pm2018-05-29
17:02:45.0 +0200
+++ new/product-builder-1.0.9/modules/KIWICollect.pm2018-04-24
18:21:20.0 +0200
@@ -396,8 +396,9 @@
$attr{source}= $package -> getSourceLocation();
$attr{script}= $package -> getScriptPath();
$attr{medium}= $package -> getMediaID();
-push @{$this->{m_metaPacks}{$name}}, \%attr;
+$metaPacks{$name} = \%attr;
}
+%{$this->{m_metaPacks}} = %metaPacks;
if(!$this->{m_metaPacks}) {
my $msg = 'KIWICollect::Init: getProductMetaPackages '
. 'returned no information, no metadata specified.';
@@ -805,6 +806,19 @@
. 'not be bootable';
$this->logMsg('W', $msg);
} else {
+my $firmware = 'bios';
+my $xmlFirmWare = $this->{m_xml}
+-> getImageType() -> getFirmwareType();
+if ($xmlFirmWare) {
+$firmware = $xmlFirmWare;
+}
+if ($firmware eq "efi" || $firmware eq "uefi") {
+my @archs = $this->{m_archlist}->headList();
+if (grep {"x86_64" eq $_} @archs) {
+$this->logMsg('I', "Add Live setup");
+$iso -> addBootLive();
+}
+}
$this->logMsg('I', "Boot methods called successfully");
$is_bootable = 1;
}
@@ -1493,15 +1507,15 @@
my $this = shift @packlist;
METAPACKAGE:
for my $metapack(@packlist) {
- for my $packOptions(@{$this->{m_metaPacks}->{$metapack}}) {
+my %packOptions = %{$this->{m_metaPacks}->{$metapack}};
my $poolPackages = $this->{m_packagePool}->{$metapack};
my $medium = 1;
my $nokeep = 0;
-if (defined($packOptions->{'medium'})) {
-if($packOptions->{'medium'} == 0) {
+if (defined($packOptions{'medium'})) {
+if($packOptions{'medium'} == 0) {
$nokeep = 1;
} else {
-$medium = $packOptions->{'medium'};
+$medium = $packOptions{'medium'};
}
}
# regular handling: unpack, put everything from CD1..CD to
@@ -1515,17 +1529,16 @@
return 1;
}
my $nofallback = 0;
-
ARCH:
for my $reqArch (
$this->getArchList(
-$packOptions, $metapack, \$nofallback
+
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-06-02 11:48:11
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Sat Jun 2 11:48:11 2018 rev:21 rq:612900 version:1.1.0
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-04-27 15:59:23.772142375 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-06-02 11:48:18.112464878 +0200
@@ -1,0 +2,10 @@
+Tue May 29 15:04:31 UTC 2018 - adr...@suse.de
+
+- 1.1.0
+ * fixed handling of metapackages with multiple lines for one package
+filtered via required architecture
+ * execute mk_listings when configured (bsc#1094929)
+ + drop promo / live boot code
+ * Add riscv64 architecture
+
+---
Old:
product-builder-1.0.9.obscpio
New:
product-builder-1.1.0.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.rikg7t/_old 2018-06-02 11:48:20.056393580 +0200
+++ /var/tmp/diff_new_pack.rikg7t/_new 2018-06-02 11:48:20.064393287 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0.9
+Version:1.1.0
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.rikg7t/_old 2018-06-02 11:48:20.188388739 +0200
+++ /var/tmp/diff_new_pack.rikg7t/_new 2018-06-02 11:48:20.188388739 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0.9
-1.0.9
+1.1.0
+1.1.0
git
rpm/product-builder.spec
++ product-builder-1.0.9.obscpio -> product-builder-1.1.0.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.9/modules/KIWICollect.pm
new/product-builder-1.1.0/modules/KIWICollect.pm
--- old/product-builder-1.0.9/modules/KIWICollect.pm2018-04-24
18:21:20.0 +0200
+++ new/product-builder-1.1.0/modules/KIWICollect.pm2018-05-29
17:02:45.0 +0200
@@ -396,9 +396,8 @@
$attr{source}= $package -> getSourceLocation();
$attr{script}= $package -> getScriptPath();
$attr{medium}= $package -> getMediaID();
-$metaPacks{$name} = \%attr;
+push @{$this->{m_metaPacks}{$name}}, \%attr;
}
-%{$this->{m_metaPacks}} = %metaPacks;
if(!$this->{m_metaPacks}) {
my $msg = 'KIWICollect::Init: getProductMetaPackages '
. 'returned no information, no metadata specified.';
@@ -806,19 +805,6 @@
. 'not be bootable';
$this->logMsg('W', $msg);
} else {
-my $firmware = 'bios';
-my $xmlFirmWare = $this->{m_xml}
--> getImageType() -> getFirmwareType();
-if ($xmlFirmWare) {
-$firmware = $xmlFirmWare;
-}
-if ($firmware eq "efi" || $firmware eq "uefi") {
-my @archs = $this->{m_archlist}->headList();
-if (grep {"x86_64" eq $_} @archs) {
-$this->logMsg('I', "Add Live setup");
-$iso -> addBootLive();
-}
-}
$this->logMsg('I', "Boot methods called successfully");
$is_bootable = 1;
}
@@ -1507,15 +1493,15 @@
my $this = shift @packlist;
METAPACKAGE:
for my $metapack(@packlist) {
-my %packOptions = %{$this->{m_metaPacks}->{$metapack}};
+ for my $packOptions(@{$this->{m_metaPacks}->{$metapack}}) {
my $poolPackages = $this->{m_packagePool}->{$metapack};
my $medium = 1;
my $nokeep = 0;
-if (defined($packOptions{'medium'})) {
-if($packOptions{'medium'} == 0) {
+if (defined($packOptions->{'medium'})) {
+if($packOptions->{'medium'} == 0) {
$nokeep = 1;
} else {
-$medium = $packOptions{'medium'};
+$medium = $packOptions->{'medium'};
}
}
# regular handling: unpack, put everything from CD1..CD to
@@ -1529,16 +1515,17 @@
return 1;
}
my $nofallback = 0;
+
ARCH:
for my $reqArch (
$this->getArchList(
-$this->{m_metaPacks}->{$metapack}, $metapack,
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-04-27 15:59:18
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Fri Apr 27 15:59:18 2018 rev:20 rq:600695 version:1.0.9
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-04-06 17:46:37.773814740 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-04-27 15:59:23.772142375 +0200
@@ -1,0 +2,7 @@
+Tue Apr 24 16:22:46 UTC 2018 - adr...@suse.de
+
+- 1.0.9
+ * have a different medium name in media.?/media for debug and
+source medium
+
+---
Old:
product-builder-1.0.8.obscpio
New:
product-builder-1.0.9.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.O99iIO/_old 2018-04-27 15:59:24.480116389 +0200
+++ /var/tmp/diff_new_pack.O99iIO/_new 2018-04-27 15:59:24.484116242 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0.8
+Version:1.0.9
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.O99iIO/_old 2018-04-27 15:59:24.520114920 +0200
+++ /var/tmp/diff_new_pack.O99iIO/_new 2018-04-27 15:59:24.520114920 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0.8
-1.0.8
+1.0.9
+1.0.9
git
rpm/product-builder.spec
++ product-builder-1.0.8.obscpio -> product-builder-1.0.9.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.8/modules/KIWICollect.pm
new/product-builder-1.0.9/modules/KIWICollect.pm
--- old/product-builder-1.0.8/modules/KIWICollect.pm2018-03-26
12:49:17.0 +0200
+++ new/product-builder-1.0.9/modules/KIWICollect.pm2018-04-24
18:21:20.0 +0200
@@ -1270,8 +1270,11 @@
$this->logMsg('E', "Cannot create file <$mediafile>");
return;
}
+my $medium_suffix = "";
+$medium_suffix = "-DEBUG" if $n gt 1 && $this->{m_debugmedium} ==
$n;
+$medium_suffix = "-SOURCE" if $n gt 1 && $this->{m_srcmedium} ==
$n;
print $MEDIA "$manufacturer - ";
-print $MEDIA "$medium_name\n";
+print $MEDIA "$medium_name$medium_suffix\n";
print $MEDIA $this->{m_proddata}->getVar("BUILD_ID", "0")."\n";
if($num == 1) {
# some specialities for medium number 1: contains a line with
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.O99iIO/_old 2018-04-27 15:59:24.696108461 +0200
+++ /var/tmp/diff_new_pack.O99iIO/_new 2018-04-27 15:59:24.700108314 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0.8
-mtime: 1522061357
-commit: 22ae244ce8b24fb167335cb78fa87fbb60c3358b
+version: 1.0.9
+mtime: 1524586880
+commit: ac313bf62d317dba12acbd1f8446242924dca473
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-04-06 17:46:31
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Fri Apr 6 17:46:31 2018 rev:19 rq:593833 version:1.0.8
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-03-20 21:53:48.771826376 +0100
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-04-06 17:46:37.773814740 +0200
@@ -1,0 +2,6 @@
+Mon Mar 26 10:54:12 UTC 2018 - adr...@suse.de
+
+- 1.0.8
+ * support skelcd with NET subfolder
+
+---
Old:
product-builder-1.0.7.obscpio
New:
product-builder-1.0.8.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.g31sMr/_old 2018-04-06 17:46:38.513787995 +0200
+++ /var/tmp/diff_new_pack.g31sMr/_new 2018-04-06 17:46:38.517787851 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0.7
+Version:1.0.8
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.g31sMr/_old 2018-04-06 17:46:38.549786694 +0200
+++ /var/tmp/diff_new_pack.g31sMr/_new 2018-04-06 17:46:38.549786694 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0.7
-1.0.7
+1.0.8
+1.0.8
git
rpm/product-builder.spec
++ product-builder-1.0.7.obscpio -> product-builder-1.0.8.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.7/modules/KIWICollect.pm
new/product-builder-1.0.8/modules/KIWICollect.pm
--- old/product-builder-1.0.7/modules/KIWICollect.pm2018-03-13
06:41:14.0 +0100
+++ new/product-builder-1.0.8/modules/KIWICollect.pm2018-03-26
12:49:17.0 +0200
@@ -1593,9 +1593,20 @@
qx(cp -a $tmp/CD$_/* $this->{m_basesubdir}->{$_});
$this->logMsg('W', "Unpack from old legacy /CD$_
directory");
} elsif ($_ eq 1) {
-my $msg;
-$msg = "No /usr/lib/skelcd/CD1 directory in
$packPointer->{localfile}";
-$this->logMsg('W', $msg);
+# Path /usr/lib/skelcd/NET has introduced in
skelcd-installer-net-openSUSE for mini iso
+if (-d "$tmp/usr/lib/skelcd/NET"
+and defined $this->{m_basesubdir}->{$_}
+) {
+qx(cp -a $tmp/usr/lib/skelcd/NET/*
$this->{m_basesubdir}->{$_});
+# .treeinfo for virt-installer:
+qx(cp -a $tmp/usr/lib/skelcd/NET/.treeinfo
$this->{m_basesubdir}->{$_}) if (-f "$tmp/usr/lib/skelcd/NET/.treeinfo");
+$this->logMsg('I', "Unpack NET");
+$packageFound = 1;
+} else {
+my $msg;
+$msg = "No /usr/lib/skelcd/CD1 directory in
$packPointer->{localfile}";
+$this->logMsg('W', $msg);
+}
}
}
next ARCH if $packageFound;
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.g31sMr/_old 2018-04-06 17:46:38.733780044 +0200
+++ /var/tmp/diff_new_pack.g31sMr/_new 2018-04-06 17:46:38.733780044 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0.7
-mtime: 1520919674
-commit: 880d31562cae82fd860ed50087b5bb1f07d692f0
+version: 1.0.8
+mtime: 1522061357
+commit: 22ae244ce8b24fb167335cb78fa87fbb60c3358b
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-03-20 21:53:41
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Tue Mar 20 21:53:41 2018 rev:18 rq:586163 version:1.0.7
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-03-06 10:43:51.411721563 +0100
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-03-20 21:53:48.771826376 +0100
@@ -1,0 +2,15 @@
+Tue Mar 13 05:45:03 UTC 2018 - co...@suse.com
+
+- 1.0.7
+ * fix ppc64le (related to bsc#1084893)
+- align with SLE changes file (add accept_old_meta_package.patch)
+
+---
+Thu Mar 8 08:48:41 UTC 2018 - adr...@suse.de
+
+- 1.0.6
+ * fixed platform ID for EFI boot (bsc#1081739)
+- fix dependencies to mkisofs
+- using spec file from git now
+
+---
Old:
product-builder-1.0.5.obscpio
New:
product-builder-1.0.7.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.ijjvNv/_old 2018-03-20 21:53:49.779790081 +0100
+++ /var/tmp/diff_new_pack.ijjvNv/_new 2018-03-20 21:53:49.783789937 +0100
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0.5
+Version:1.0.7
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
@@ -46,8 +46,8 @@
Provides: system-packages:kiwi-product
Requires: build
Requires: checkmedia
-Requires: genisoimage
Requires: inst-source-utils
+Requires: mkisofs
Requires: product-builder-plugin
%ifarch %ix86 x86_64
Requires: syslinux
@@ -61,7 +61,7 @@
%prep
%setup -q
-%if 0%{?suse_version} == 1330 || 0%{?skelcd_compat}
+%if 0%{?skelcd_compat}
%patch1 -p1
%endif
++ _service ++
--- /var/tmp/diff_new_pack.ijjvNv/_old 2018-03-20 21:53:49.819788641 +0100
+++ /var/tmp/diff_new_pack.ijjvNv/_new 2018-03-20 21:53:49.823788497 +0100
@@ -1,9 +1,10 @@
https://github.com/openSUSE/product-builder.git
-1.0.5
-1.0.5
+1.0.7
+1.0.7
git
+rpm/product-builder.spec
++ product-builder-1.0.5.obscpio -> product-builder-1.0.7.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.5/modules/KIWIIsoLinux.pm
new/product-builder-1.0.7/modules/KIWIIsoLinux.pm
--- old/product-builder-1.0.5/modules/KIWIIsoLinux.pm 2018-03-02
09:28:45.0 +0100
+++ new/product-builder-1.0.7/modules/KIWIIsoLinux.pm 2018-03-13
06:41:14.0 +0100
@@ -158,9 +158,12 @@
if ($arch eq "ix86") {
$catalog[0] = "ix86_legacy";
}
-if ($arch =~ /ppc64|ppc64le/) {
+if ($arch eq "ppc64") {
$catalog[0] = "ppc64_default";
}
+if ($arch eq "ppc64le") {
+$catalog[0] = "ppc64le_default";
+}
if ($arch eq "s390") {
if (-d $source."/".$base{ix86}{boot}) {
$catalog[0] = "ix86_legacy";
@@ -307,6 +310,7 @@
my $boot = $base{$arch}{boot};
my $loader= $base{$arch}{efi};
$para.= " -eltorito-alt-boot";
+$para.= " -eltorito-platform efi";
$para.= " -no-emul-boot";
$para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader);
$para.= " -b $loader";
@@ -325,6 +329,7 @@
my $boot = $base{$arch}{boot};
my $loader= $base{$arch}{efi};
$para.= " -eltorito-alt-boot";
+$para.= " -eltorito-platform efi";
$para.= " -no-emul-boot";
$para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader);
$para.= " -b $loader";
@@ -417,6 +422,12 @@
return $this;
}
+sub ppc64le_default {
+my $this = shift;
+my $arch = shift;
+$this->ppc64_default($arch);
+}
+
#==
# aarch64_efi
#--
@@ -487,6 +498,7 @@
#--
if (($firmware ne 'bios') && (-e "$src/boot/$arch/efi")) {
$para.= ' -eltorito-alt-boot ';
+$para.= " -eltorito-platform efi";
$para.= " -b boot/$arch/efi";
}
$para.= ' -no-emul-boot -joliet-long -hide glump -hide-joliet glump';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.5/rpm/product-builder.spec
commit product-builder for openSUSE:Factory
Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2018-03-06 10:43:48 Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) Package is "product-builder" Tue Mar 6 10:43:48 2018 rev:17 rq:581924 version:1.0.5 Changes: --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2018-02-22 14:58:33.642390740 +0100 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2018-03-06 10:43:51.411721563 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 08:31:12 UTC 2018 - adr...@suse.de + +- 1.0.5 + * use mkisofs instead of unmaintained wodim + +--- Old: product-builder-1.0.4.obscpio New: product-builder-1.0.5.obscpio Other differences: -- ++ product-builder.spec ++ --- /var/tmp/diff_new_pack.FhNfxT/_old 2018-03-06 10:43:52.399685868 +0100 +++ /var/tmp/diff_new_pack.FhNfxT/_new 2018-03-06 10:43:52.403685723 +0100 @@ -17,13 +17,13 @@ Summary:SUSE Product Builder -License:GPL-2.0 +License:GPL-2.0-only Group: System/Management Url:http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version:1.0.4 +Version:1.0.5 Release:0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++ _service ++ --- /var/tmp/diff_new_pack.FhNfxT/_old 2018-03-06 10:43:52.439684423 +0100 +++ /var/tmp/diff_new_pack.FhNfxT/_new 2018-03-06 10:43:52.443684279 +0100 @@ -1,8 +1,8 @@ https://github.com/openSUSE/product-builder.git -1.0.4 -1.0.4 +1.0.5 +1.0.5 git ++ product-builder-1.0.4.obscpio -> product-builder-1.0.5.obscpio ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.0.4/rpm/product-builder.spec new/product-builder-1.0.5/rpm/product-builder.spec --- old/product-builder-1.0.4/rpm/product-builder.spec 2018-02-21 10:32:04.0 +0100 +++ new/product-builder-1.0.5/rpm/product-builder.spec 2018-03-02 09:28:45.0 +0100 @@ -43,7 +43,7 @@ Requires: build Requires: inst-source-utils Requires: product-builder-plugin -Requires: genisoimage +Requires: mkisofs Requires: checkmedia %ifarch %ix86 x86_64 Requires: syslinux ++ product-builder.obsinfo ++ --- /var/tmp/diff_new_pack.FhNfxT/_old 2018-03-06 10:43:52.659676475 +0100 +++ /var/tmp/diff_new_pack.FhNfxT/_new 2018-03-06 10:43:52.659676475 +0100 @@ -1,5 +1,5 @@ name: product-builder -version: 1.0.4 -mtime: 1519205524 -commit: 93ea979a3c247bb99c66e775c8c851e08a3bb26c +version: 1.0.5 +mtime: 1519979325 +commit: 8ccb98e1d747fa2ef6581446db393f750db32a05
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-02-22 14:58:30
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Thu Feb 22 14:58:30 2018 rev:16 rq:578647 version:1.0.4
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-01-20 11:22:58.122874911 +0100
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-02-22 14:58:33.642390740 +0100
@@ -1,0 +2,6 @@
+Fri Feb 16 12:26:43 UTC 2018 - adr...@suse.de
+
+- 1.0.4
+ * Fix ChangeLog file generation
+
+---
Old:
product-builder-1.0.3.obscpio
New:
product-builder-1.0.4.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.hgjKHS/_old 2018-02-22 14:58:34.654354330 +0100
+++ /var/tmp/diff_new_pack.hgjKHS/_new 2018-02-22 14:58:34.658354186 +0100
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0.3
+Version:1.0.4
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.hgjKHS/_old 2018-02-22 14:58:34.686353179 +0100
+++ /var/tmp/diff_new_pack.hgjKHS/_new 2018-02-22 14:58:34.690353035 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0.3
-1.0.3
+1.0.4
+1.0.4
git
++ product-builder-1.0.3.obscpio -> product-builder-1.0.4.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.3/modules/KIWICollect.pm
new/product-builder-1.0.4/modules/KIWICollect.pm
--- old/product-builder-1.0.3/modules/KIWICollect.pm2018-01-19
14:10:26.0 +0100
+++ new/product-builder-1.0.4/modules/KIWICollect.pm2018-02-21
10:32:04.0 +0100
@@ -2115,6 +2115,8 @@
$this->logMsg('E', $msg);
return;
}
+# we have no suse/ subdir anymore
+$ENV{'ROOT_ON_CD'} = ".";
my @data = qx($mk_cl $this->{m_basesubdir}->{'1'});
my $res = $? >> 8;
if($res == 0) {
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.hgjKHS/_old 2018-02-22 14:58:34.830347998 +0100
+++ /var/tmp/diff_new_pack.hgjKHS/_new 2018-02-22 14:58:34.834347854 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0.3
-mtime: 1516367265
-commit: e9250d03ed780aa8403437c445d0233edd90b135
+version: 1.0.4
+mtime: 1519205524
+commit: 93ea979a3c247bb99c66e775c8c851e08a3bb26c
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-01-20 11:22:55
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Sat Jan 20 11:22:55 2018 rev:15 rq:567691 version:1.0.3
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-01-16 09:40:24.555197436 +0100
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-01-20 11:22:58.122874911 +0100
@@ -1,0 +2,13 @@
+Fri Jan 19 13:10:30 UTC 2018 - adr...@suse.de
+
+- 1.0.3
+ * Adapt to changed -debuginfo-32bit -> -32bit-debuginfo name scheme in SLE 15
+(incompatible change)
+
+---
+Tue Jan 16 13:43:20 UTC 2018 - adr...@suse.de
+
+- 1.0.2
+ * drop IA64 support and fix corner case for qemu-x86-debug* packages
+
+---
Old:
product-builder-1.0.1.obscpio
New:
product-builder-1.0.3.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.0b8Kzz/_old 2018-01-20 11:22:59.494810772 +0100
+++ /var/tmp/diff_new_pack.0b8Kzz/_new 2018-01-20 11:22:59.494810772 +0100
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0.1
+Version:1.0.3
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.0b8Kzz/_old 2018-01-20 11:22:59.530809089 +0100
+++ /var/tmp/diff_new_pack.0b8Kzz/_new 2018-01-20 11:22:59.534808902 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0.1
-1.0.1
+1.0.3
+1.0.3
git
++ product-builder-1.0.1.obscpio -> product-builder-1.0.3.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.1/modules/KIWICollect.pm
new/product-builder-1.0.3/modules/KIWICollect.pm
--- old/product-builder-1.0.1/modules/KIWICollect.pm2018-01-11
14:29:36.0 +0100
+++ new/product-builder-1.0.3/modules/KIWICollect.pm2018-01-19
14:10:26.0 +0100
@@ -1148,19 +1148,21 @@
# if they exist at all
my $suffix = "";
my $basename = $packName;
-for my $tsuffix (qw(32bit 64bit x86)) {
+# we used to have also x86 for ia64 compat
packages, but meanwhile
+# real life -x86 packages exist
+for my $tsuffix (qw(32bit 64bit)) {
next unless $packName =~ /^(.*)(-$tsuffix)$/;
$basename = $1;
$suffix = $2;
last;
}
-$this->addDebugPackage(
$srcname."-debuginfo".$suffix,
+$this->addDebugPackage(
$srcname.$suffix."-debuginfo",
$arch, $packPointer);
$this->addDebugPackage(
$srcname."-debugsource", $arch,
$packPointer);
$this->addDebugPackage(
-$basename."-debuginfo".$suffix,
+$basename.$suffix."-debuginfo",
$arch, $packPointer) unless $srcname eq
$basename;
}
}
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.0b8Kzz/_old 2018-01-20 11:22:59.798796560 +0100
+++ /var/tmp/diff_new_pack.0b8Kzz/_new 2018-01-20 11:22:59.798796560 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0.1
-mtime: 1515677262
-commit: fa328bf8490302d26eea834c12f3ee981ef1afc3
+version: 1.0.3
+mtime: 1516367265
+commit: e9250d03ed780aa8403437c445d0233edd90b135
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-01-16 09:40:22
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Tue Jan 16 09:40:22 2018 rev:14 rq:563604 version:1.0.1
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-12-06 08:54:05.646857757 +0100
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-01-16 09:40:24.555197436 +0100
@@ -1,0 +2,7 @@
+Thu Jan 11 13:29:47 UTC 2018 - adr...@suse.de
+
+- 1.0.1
+ * allow to call mk_changelog again (bsc#1050404)
+default is still off
+
+---
Old:
product-builder-1.0.obscpio
New:
product-builder-1.0.1.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.LImsRw/_old 2018-01-16 09:40:26.263117492 +0100
+++ /var/tmp/diff_new_pack.LImsRw/_new 2018-01-16 09:40:26.267117304 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0
+Version:1.0.1
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.LImsRw/_old 2018-01-16 09:40:26.35245 +0100
+++ /var/tmp/diff_new_pack.LImsRw/_new 2018-01-16 09:40:26.315115058 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0
-1.0
+1.0.1
+1.0.1
git
++ product-builder-1.0.obscpio -> product-builder-1.0.1.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0/modules/KIWICollect.pm
new/product-builder-1.0.1/modules/KIWICollect.pm
--- old/product-builder-1.0/modules/KIWICollect.pm 2017-10-06
10:16:45.0 +0200
+++ new/product-builder-1.0.1/modules/KIWICollect.pm2018-01-11
14:29:36.0 +0100
@@ -2103,6 +2103,34 @@
sub createMetadata {
my $this = shift;
+my $make_listings = $this->{m_proddata}->getVar("MAKE_LISTINGS");
+if (defined($make_listings) && $make_listings eq "true") {
+$this->logMsg('I', "Running mk_changelog for base directory");
+my $mk_cl = "/usr/bin/mk_changelog";
+if(! (-f $mk_cl or -x $mk_cl)) {
+my $msg = "[createMetadata] excutable `$mk_cl` not found. Maybe "
+. 'package `inst-source-utils` is not installed?';
+$this->logMsg('E', $msg);
+return;
+}
+my @data = qx($mk_cl $this->{m_basesubdir}->{'1'});
+my $res = $? >> 8;
+if($res == 0) {
+$this->logMsg('I', "$mk_cl finished successfully.");
+}
+else {
+$this->logMsg(
+'E', "$mk_cl finished with errors: returncode was $res"
+);
+}
+$this->logMsg('I', "[createMetadata] $mk_cl output:");
+foreach(@data) {
+chomp $_;
+$this->logMsg('I', "\t$_");
+}
+@data = ();
+}
+
# retrieve a complete list of all loaded plugins
my %plugins = $this->{m_metacreator}->getPluginList();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0/modules/KIWIIsoLinux.pm
new/product-builder-1.0.1/modules/KIWIIsoLinux.pm
--- old/product-builder-1.0/modules/KIWIIsoLinux.pm 2017-12-01
11:12:17.0 +0100
+++ new/product-builder-1.0.1/modules/KIWIIsoLinux.pm 2018-01-11
14:29:36.0 +0100
@@ -1081,9 +1081,9 @@
my $check= $this -> {check};
my $data;
if (defined $this->{check}) {
-$data = KIWIQX::qxx ("tagmedia --md5 --check --pad 150 $dest 2>&1");
+$data = KIWIQX::qxx ("tagmedia --digest sha256 --check --pad 150 $dest
2>&1");
} else {
-$data = KIWIQX::qxx ("tagmedia --md5 $dest 2>&1");
+$data = KIWIQX::qxx ("tagmedia --digest sha256 $dest 2>&1");
}
my $code = $? >> 8;
if ($code != 0) {
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.LImsRw/_old 2018-01-16 09:40:26.567103263 +0100
+++ /var/tmp/diff_new_pack.LImsRw/_new 2018-01-16 09:40:26.567103263 +0100
@@ -1,5 +1,5 @@
name: product-builder
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-12-06 08:54:02
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Wed Dec 6 08:54:02 2017 rev:13 rq:547017 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-11-24 10:52:07.561423534 +0100
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-12-06 08:54:05.646857757 +0100
@@ -1,0 +2,6 @@
+Fri Dec 1 10:14:49 UTC 2017 - adr...@suse.de
+
+- tag it as 1.0
+- fix UEFI secure boot (bsc#939456)
+
+---
Old:
product-builder-1.0~pre.1507277845.84ea077.obscpio
New:
product-builder-1.0.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.0XQQeY/_old 2017-12-06 08:54:06.654820858 +0100
+++ /var/tmp/diff_new_pack.0XQQeY/_new 2017-12-06 08:54:06.658820712 +0100
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0~pre.1507277845.84ea077
+Version:1.0
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.0XQQeY/_old 2017-12-06 08:54:06.694819394 +0100
+++ /var/tmp/diff_new_pack.0XQQeY/_new 2017-12-06 08:54:06.694819394 +0100
@@ -1,7 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.0~pre
+1.0
+1.0
git
++ product-builder-1.0~pre.1507277845.84ea077.obscpio ->
product-builder-1.0.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-1.0~pre.1507277845.84ea077/modules/KIWIIsoLinux.pm
new/product-builder-1.0/modules/KIWIIsoLinux.pm
--- old/product-builder-1.0~pre.1507277845.84ea077/modules/KIWIIsoLinux.pm
2017-08-11 15:22:47.0 +0200
+++ new/product-builder-1.0/modules/KIWIIsoLinux.pm 2017-12-01
11:12:17.0 +0100
@@ -242,6 +242,20 @@
return $this;
}
+sub block_size {
+my $this = shift;
+my $filename = shift;
+if (! sysopen(fh,$filename,O_RDONLY) ) {
+my $kiwi = $this->{kiwi};
+$kiwi -> error ("Cannot open file $filename: $!");
+$kiwi -> failed ();
+return -1;
+}
+my $size = (stat(fh))[7];
+close(fh);
+return ($size/512);
+}
+
#==
# x86_64_legacy
#--
@@ -294,7 +308,7 @@
my $loader= $base{$arch}{efi};
$para.= " -eltorito-alt-boot";
$para.= " -no-emul-boot";
-$para.= " -boot-load-size 1";
+$para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader);
$para.= " -b $loader";
$this -> {params} = $para;
return $this;
@@ -312,7 +326,7 @@
my $loader= $base{$arch}{efi};
$para.= " -eltorito-alt-boot";
$para.= " -no-emul-boot";
-$para.= " -boot-load-size 1";
+$para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader);
$para.= " -b $loader";
$this -> {params} = $para;
return $this;
@@ -331,7 +345,7 @@
my $sort = $this -> createLegacySortFile ("ia64");
$para.= " -no-emul-boot";
-$para.= " -boot-load-size 1";
+$para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader);
$para.= " -sort $sort" if $sort;
$para.= " -b $loader";
$para.= " -c $boot/boot.catalog";
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.0XQQeY/_old 2017-12-06 08:54:06.874812805 +0100
+++ /var/tmp/diff_new_pack.0XQQeY/_new 2017-12-06 08:54:06.878812658 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0~pre.1507277845.84ea077
-mtime: 1507277845
-commit: 84ea077b51ba138f6c0acf9fdfaa8d6f316d32d1
+version: 1.0
+mtime: 1512123141
+commit: 887600a0d734a1201e8512395025a02bd908513e
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-11-24 10:52:06
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Fri Nov 24 10:52:06 2017 rev:12 rq:544118 version:1.0~pre.1507277845.84ea077
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-10-10 11:38:00.232593684 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-11-24 10:52:07.561423534 +0100
@@ -1,0 +2,8 @@
+Tue Nov 21 09:49:23 UTC 2017 - dims...@opensuse.org
+
+- Apply accept_old_meta_package.patch also in case prjmeta has a
+ skelcd_compat variable defined. This allows us to change
+ suse_version while still not being able to migrate to the new
+ product converter/builder for Tumbleweed.
+
+---
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.dDjX9X/_old 2017-11-24 10:52:08.669383059 +0100
+++ /var/tmp/diff_new_pack.dDjX9X/_new 2017-11-24 10:52:08.669383059 +0100
@@ -61,7 +61,7 @@
%prep
%setup -q
-%if 0%{?suse_version} == 1330
+%if 0%{?suse_version} == 1330 || 0%{?skelcd_compat}
%patch1 -p1
%endif
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-10-10 11:37:55
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Tue Oct 10 11:37:55 2017 rev:11 rq:532160 version:1.0~pre.1507277845.84ea077
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-09-27 16:53:57.678815286 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-10-10 11:38:00.232593684 +0200
@@ -1,0 +2,5 @@
+Fri Oct 6 10:04:45 UTC 2017 - adr...@suse.de
+
+- patch README.BETA again
+
+---
@@ -6 +11 @@
-- building seperate media is an explicit setting now
+- building separate media is an explicit setting now
Old:
product-builder-1.0~pre.1506336035.066b85a.obscpio
New:
product-builder-1.0~pre.1507277845.84ea077.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.FGKz3n/_old 2017-10-10 11:38:03.404454475 +0200
+++ /var/tmp/diff_new_pack.FGKz3n/_new 2017-10-10 11:38:03.408454300 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0~pre.1506336035.066b85a
+Version:1.0~pre.1507277845.84ea077
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ product-builder-1.0~pre.1506336035.066b85a.obscpio ->
product-builder-1.0~pre.1507277845.84ea077.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-1.0~pre.1506336035.066b85a/modules/KIWICollect.pm
new/product-builder-1.0~pre.1507277845.84ea077/modules/KIWICollect.pm
--- old/product-builder-1.0~pre.1506336035.066b85a/modules/KIWICollect.pm
2017-09-25 12:48:22.0 +0200
+++ new/product-builder-1.0~pre.1507277845.84ea077/modules/KIWICollect.pm
2017-10-06 10:16:45.0 +0200
@@ -1203,7 +1203,7 @@
# the dependency solver need to tell if a package is not matching
return 1 if $number == $this->{m_debugmedium};
-return 1 if $this->{m_proddata}->getVar("SEPERATE_MEDIA") eq "true";
+return 1 if $this->{m_proddata}->getVar("SEPARATE_MEDIA") eq "true";
return 0;
}
@@ -1370,7 +1370,22 @@
$support_fd -> close();
}
-# step 5: products file
+# step 5: handle beta information
+my $beta_version = $this->{m_proddata}->getOpt("BETA_VERSION");
+my $readme_file = "$this->{m_basesubdir}->{'1'}/README.BETA";
+if (defined($beta_version)) {
+my $dist_string = $this->{m_proddata}->getVar("PRODUCT_SUMMARY")."
".${beta_version};
+$dist_string = $this->{m_proddata}->getVar("PRODUCT_SUMMARY")."
".${beta_version};
+$dist_string =~ s/\Q\/\E/\\\//g;
+if (system("sed", "-i", "s/BETA_DIST_VERSION/$dist_string/",
$readme_file) != 0) {
+$this->logMsg('W', "Failed to replace beta version in README.BETA
file!");
+};
+} elsif ( -e $readme_file ) {
+$this->logMsg('I', "Dropping README.BETA file");
+unlink($readme_file);
+}
+
+# step 6: products file
$this->logMsg('I', "Creating products file in all media:");
my $prodname= $this->{m_proddata}->getVar("PRODUCT_NAME");
my $prodsummary = $this->{m_proddata}->getVar("PRODUCT_SUMMARY");
@@ -1404,7 +1419,7 @@
close $PRODUCT;
}
-# step 6: write out the channel files based on the collected rpms
+# step 7: write out the channel files based on the collected rpms
for my $m (keys(%{$this->{m_reportLog}})) {
my $medium = $this->{m_reportLog}->{$m};
my $fd;
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.FGKz3n/_old 2017-10-10 11:38:03.640444118 +0200
+++ /var/tmp/diff_new_pack.FGKz3n/_new 2017-10-10 11:38:03.63942 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0~pre.1506336035.066b85a
-mtime: 1506336035
-commit: 066b85a68cca9eb3b3e474fe8dfc12cb8b7a893b
+version: 1.0~pre.1507277845.84ea077
+mtime: 1507277845
+commit: 84ea077b51ba138f6c0acf9fdfaa8d6f316d32d1
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-09-27 16:53:55
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Wed Sep 27 16:53:55 2017 rev:10 rq:528737 version:1.0~pre.1506336035.066b85a
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-09-18 19:50:58.840522543 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-09-27 16:53:57.678815286 +0200
@@ -1,0 +2,7 @@
+Fri Sep 22 08:25:18 UTC 2017 - adr...@suse.de
+
+- bring back media.?/media file
+- drop media.?/build instead
+- building seperate media is an explicit setting now
+
+---
Old:
product-builder-1.0~pre.1505473893.8038263.obscpio
New:
product-builder-1.0~pre.1506336035.066b85a.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.ex9KAW/_old 2017-09-27 16:54:00.534413557 +0200
+++ /var/tmp/diff_new_pack.ex9KAW/_new 2017-09-27 16:54:00.538412996 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0~pre.1505473893.8038263
+Version:1.0~pre.1506336035.066b85a
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ product-builder-1.0~pre.1505473893.8038263.obscpio ->
product-builder-1.0~pre.1506336035.066b85a.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-1.0~pre.1505473893.8038263/modules/KIWICollect.pm
new/product-builder-1.0~pre.1506336035.066b85a/modules/KIWICollect.pm
--- old/product-builder-1.0~pre.1505473893.8038263/modules/KIWICollect.pm
2017-09-15 13:11:30.0 +0200
+++ new/product-builder-1.0~pre.1506336035.066b85a/modules/KIWICollect.pm
2017-09-25 12:48:22.0 +0200
@@ -548,7 +548,7 @@
return;
}
my @media = $this->getMediaNumbers();
-my $mult = $this->{m_proddata}->getVar("MULTIPLE_MEDIA", "yes");
+my $mult = $this->{m_proddata}->getVar("MULTIPLE_MEDIA", "true");
my $dirext = undef;
if($mult eq "no" || $mult eq "false") {
if(scalar(@media) == 1) {
@@ -558,7 +558,7 @@
#"medium=" somewhere!
my $msg = 'You want a single medium distro but specified '
. "medium=... for some packages\n\tIgnoring the "
-. 'MULTIPLE_MEDIA=no flag!';
+. 'MULTIPLE_MEDIA=false flag!';
$this->logMsg('W', $msg);
}
}
@@ -570,12 +570,7 @@
$this->{m_dirlist}->{"$dirbase/repodata"} = 1;
my $curdir = "$dirbase/";
my $num = $n;
-if ( $this->{m_proddata}->getVar("FLAVOR", '') eq "ftp"
-or $this->{m_proddata}->getVar("FLAVOR", '') eq "POOL"
-or $n == $this->{m_debugmedium}
-) {
-$num = 1;
-}
+$num = 1 if $this->seperateMedium($n);
$this->{m_dirlist}->{"$dirbase/media.$num"} = 1;
$this->{m_basesubdir}->{$n} = "$dirbase";
$this->{m_dirlist}->{"$this->{m_basesubdir}->{$n}"} = 1;
@@ -772,7 +767,7 @@
$vname =~ s/-Media//;
$vname =~ s/-Build// if length($vname) > ($volid_maxlen - 4);
my $vid = substr($vname,0,($volid_maxlen));
-if ($this->{m_proddata}->getVar("MULTIPLE_MEDIA", "yes") eq "yes")
{
+if ($this->{m_proddata}->getVar("MULTIPLE_MEDIA", "true") eq
"true") {
$vid = sprintf(
"%s.%03d",
substr($vname,0,($volid_maxlen - 4)), $cd
@@ -789,7 +784,6 @@
$attr .= " -V \"$vid\"";
my $checkmedia = '';
if ( defined($this->{m_proddata}->getVar("RUN_MEDIA_CHECK"))
-&& $this->{m_proddata}->getVar("RUN_MEDIA_CHECK") ne "0"
&& $this->{m_proddata}->getVar("RUN_MEDIA_CHECK") ne "false"
) {
$checkmedia = "checkmedia";
@@ -1198,6 +1192,22 @@
return $retval;
}
+
+#
+# Decide if a medium is joined with others or not
+#
+sub seperateMedium {
+my ($this, $number) = @_;
+
+# debug medium should always be optional to ship
+# the dependency solver need to tell if a package is not matching
+return 1 if $number == $this->{m_debugmedium};
+
+return 1 if $this->{m_proddata}->getVar("SEPERATE_MEDIA") eq "true";
+
+return 0;
+}
+
commit product-builder for openSUSE:Factory
Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2017-09-18 19:50:53 Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) Package is "product-builder" Mon Sep 18 19:50:53 2017 rev:9 rq:526359 version:1.0~pre.1505473893.8038263 Changes: --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2017-09-13 21:38:22.450328777 +0200 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2017-09-18 19:50:58.840522543 +0200 @@ -1,0 +2,5 @@ +Fri Sep 15 11:12:10 UTC 2017 - adr...@suse.de + +- copy .treeinfo for virt-installer + +--- Old: product-builder-1.0~pre.1505229546.36dadce.obscpio New: product-builder-1.0~pre.1505473893.8038263.obscpio Other differences: -- ++ product-builder.spec ++ --- /var/tmp/diff_new_pack.3b14Iz/_old 2017-09-18 19:51:01.000218785 +0200 +++ /var/tmp/diff_new_pack.3b14Iz/_new 2017-09-18 19:51:01.008217660 +0200 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version:1.0~pre.1505229546.36dadce +Version:1.0~pre.1505473893.8038263 Release:0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++ product-builder.obsinfo ++ --- /var/tmp/diff_new_pack.3b14Iz/_old 2017-09-18 19:51:01.136199660 +0200 +++ /var/tmp/diff_new_pack.3b14Iz/_new 2017-09-18 19:51:01.140199097 +0200 @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1505229546.36dadce -mtime: 1505229546 -commit: 36dadcef68771d96302906ade1dfc9a4404216e0 +version: 1.0~pre.1505473893.8038263 +mtime: 1505473893 +commit: 80382634c955155c42edf7c8c8ac843ca5298483
commit product-builder for openSUSE:Factory
Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2017-09-13 21:38:17 Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) Package is "product-builder" Wed Sep 13 21:38:17 2017 rev:8 rq:523757 version:1.0~pre.1505229546.36dadce Changes: --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2017-09-07 22:12:59.496857482 +0200 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2017-09-13 21:38:22.450328777 +0200 @@ -1,0 +2,5 @@ +Tue Sep 12 15:21:26 UTC 2017 - adr...@suse.de + +- detect all products which got put on media + +--- Old: product-builder-1.0~pre.1503327890.95c265e.obscpio New: product-builder-1.0~pre.1505229546.36dadce.obscpio Other differences: -- ++ product-builder.spec ++ --- /var/tmp/diff_new_pack.DoQWPQ/_old 2017-09-13 21:38:23.382197663 +0200 +++ /var/tmp/diff_new_pack.DoQWPQ/_new 2017-09-13 21:38:23.386197100 +0200 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version:1.0~pre.1503327890.95c265e +Version:1.0~pre.1505229546.36dadce Release:0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++ product-builder.obsinfo ++ --- /var/tmp/diff_new_pack.DoQWPQ/_old 2017-09-13 21:38:23.454187534 +0200 +++ /var/tmp/diff_new_pack.DoQWPQ/_new 2017-09-13 21:38:23.454187534 +0200 @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1503327890.95c265e -mtime: 1503327890 -commit: 95c265e19d66c06f1cbf596b026c4eefc774478b +version: 1.0~pre.1505229546.36dadce +mtime: 1505229546 +commit: 36dadcef68771d96302906ade1dfc9a4404216e0
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-09-07 22:12:55
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Thu Sep 7 22:12:55 2017 rev:7 rq:521101 version:1.0~pre.1503327890.95c265e
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-07-11 15:06:09.825783377 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-09-07 22:12:59.496857482 +0200
@@ -1,0 +2,30 @@
+Tue Sep 5 10:04:52 UTC 2017 - adr...@suse.de
+
+- Add accept_old_meta_package.patch: temporarily accept metadata
+ in /CD1 for tumbleweed to ease migration.
+
+---
+Mon Aug 21 14:47:29 UTC 2017 - adr...@suse.de
+
+- bring back media.1/products file
+ => means that pure repomd data is not anymore enough for YaST
+ installer
+
+---
+Mon Aug 21 12:18:40 UTC 2017 - adr...@suse.de
+
+- fix metapackage unpack loop
+
+---
+Wed Aug 9 11:12:20 CEST 2017 - r...@suse.de
+
+- only use x86 boot image on s390/s390x if it exists
+- also, on s390/s390x if we have a x86_64 image, make that bootable
+- enforce default to abort on missing packages
+
+---
+Tue Aug 8 07:54:15 UTC 2017 - adr...@suse.de
+
+- always exit on error (bsc#1052017)
+
+---
Old:
product-builder-1.0~pre.1499777959.e6adac4.obscpio
New:
accept_old_meta_package.patch
product-builder-1.0~pre.1503327890.95c265e.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.0QzbKb/_old 2017-09-07 22:13:00.392731225 +0200
+++ /var/tmp/diff_new_pack.0QzbKb/_new 2017-09-07 22:13:00.396730661 +0200
@@ -23,10 +23,12 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0~pre.1499777959.e6adac4
+Version:1.0~pre.1503327890.95c265e
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
+# temporary hack for openSUSE:Factory only
+Patch1: accept_old_meta_package.patch
Requires: libxslt
Requires: perl >= %{perl_version}
@@ -55,11 +57,13 @@
The SUSE product builder, builds product media (CD/DVD) for
the SUSE product portfolio. Based on kiwi perl implementation.
-To be used only for product medias after openSUSE 13.2, Leap 42
-and SLE 12.
+To be used only for product medias for Leap 15 and SLE 15.
%prep
%setup -q
+%if 0%{?suse_version} == 1330
+%patch1 -p1
+%endif
%build
test -e /.buildenv && . /.buildenv
++ accept_old_meta_package.patch ++
diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm
index b3e6357..f99ca8b 100644
--- a/modules/KIWICollect.pm
+++ b/modules/KIWICollect.pm
@@ -1535,6 +1535,7 @@ sub unpackMetapackages {
and defined $this->{m_basesubdir}->{$_}
) {
qx(cp -a $tmp/CD$_/* $this->{m_basesubdir}->{$_});
+$packageFound = 1;
$this->logMsg('W', "Unpack from old legacy /CD$_
directory");
} elsif ($_ eq 1) {
my $msg;
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.0QzbKb/_old 2017-09-07 22:13:00.452722770 +0200
+++ /var/tmp/diff_new_pack.0QzbKb/_new 2017-09-07 22:13:00.456722207 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0~pre.1499777959.e6adac4
-mtime: 1499777959
-commit: e6adac40d70bfd49cde311d9f91e48ad9b5e00d7
+version: 1.0~pre.1503327890.95c265e
+mtime: 1503327890
+commit: 95c265e19d66c06f1cbf596b026c4eefc774478b
commit product-builder for openSUSE:Factory
Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2017-07-11 15:02:06 Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) Package is "product-builder" Tue Jul 11 15:02:06 2017 rev:6 rq:509450 version:1.0~pre.1499777959.e6adac4 Changes: --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2017-06-28 10:37:24.145903794 +0200 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2017-07-11 15:06:09.825783377 +0200 @@ -1,0 +2,6 @@ +Tue Jul 11 12:34:47 UTC 2017 - adr...@suse.de + +- add Provides system-packages:kiwi-product +- temporary compat code for /CD? directories in meta packages + +--- Old: product-builder-1.0~pre.1498572432.a4cad04.obscpio New: product-builder-1.0~pre.1499777959.e6adac4.obscpio Other differences: -- ++ product-builder.spec ++ --- /var/tmp/diff_new_pack.tu01UU/_old 2017-07-11 15:06:10.409701026 +0200 +++ /var/tmp/diff_new_pack.tu01UU/_new 2017-07-11 15:06:10.409701026 +0200 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version:1.0~pre.1498572432.a4cad04 +Version:1.0~pre.1499777959.e6adac4 Release:0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz @@ -41,6 +41,7 @@ Requires: perl-libwww-perl Provides: kiwi-packagemanager:instsource +Provides: system-packages:kiwi-product Requires: build Requires: checkmedia Requires: genisoimage ++ product-builder.obsinfo ++ --- /var/tmp/diff_new_pack.tu01UU/_old 2017-07-11 15:06:10.457694258 +0200 +++ /var/tmp/diff_new_pack.tu01UU/_new 2017-07-11 15:06:10.461693694 +0200 @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1498572432.a4cad04 -mtime: 1498572432 -commit: a4cad041e631217ea59411405f5175b90da502b2 +version: 1.0~pre.1499777959.e6adac4 +mtime: 1499777959 +commit: e6adac40d70bfd49cde311d9f91e48ad9b5e00d7
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-06-28 10:37:02
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Wed Jun 28 10:37:02 2017 rev:5 rq:506492 version:1.0~pre.1498572432.a4cad04
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-06-26 15:52:41.74466 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-06-28 10:37:24.145903794 +0200
@@ -1,0 +2,5 @@
+Tue Jun 27 14:18:50 UTC 2017 - adr...@suse.de
+
+- install missing file for generating PowerPC medias (bsc#1046114)
+
+---
Old:
product-builder-1.0~pre.1497939465.cb6f23f.obscpio
New:
product-builder-1.0~pre.1498572432.a4cad04.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.aEnW3p/_old 2017-06-28 10:37:25.241748764 +0200
+++ /var/tmp/diff_new_pack.aEnW3p/_new 2017-06-28 10:37:25.241748764 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.0~pre.1497939465.cb6f23f
+Version:1.0~pre.1498572432.a4cad04
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
@@ -76,6 +76,7 @@
%dir %{_datadir}/kiwi
%doc LICENSE
%{_datadir}/kiwi/.revision
+%{_datadir}/kiwi/metadata
%{_datadir}/kiwi/modules
%{_datadir}/kiwi/xsl
%{_bindir}/product-builder
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.aEnW3p/_old 2017-06-28 10:37:25.289741974 +0200
+++ /var/tmp/diff_new_pack.aEnW3p/_new 2017-06-28 10:37:25.289741974 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0~pre.1497939465.cb6f23f
-mtime: 1497939465
-commit: cb6f23f74a8aa397af9024c7556b5a16c4533647
+version: 1.0~pre.1498572432.a4cad04
+mtime: 1498572432
+commit: a4cad041e631217ea59411405f5175b90da502b2
commit product-builder for openSUSE:Factory
Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2017-06-26 15:52:35 Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) Package is "product-builder" Mon Jun 26 15:52:35 2017 rev:4 rq:505845 version:1.0~pre.1497939465.cb6f23f Changes: --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2017-05-27 13:16:47.460856610 +0200 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2017-06-26 15:52:41.74466 +0200 @@ -1,0 +2,5 @@ +Fri Jun 23 08:56:24 UTC 2017 - adr...@suse.de + +- fix unpacking of meta packages and plugin execution + +--- Old: product-builder-1.0~pre.1495619642.e97a217.obscpio New: product-builder-1.0~pre.1497939465.cb6f23f.obscpio Other differences: -- ++ product-builder.spec ++ --- /var/tmp/diff_new_pack.vaFcRQ/_old 2017-06-26 15:52:43.179799900 +0200 +++ /var/tmp/diff_new_pack.vaFcRQ/_new 2017-06-26 15:52:43.183799336 +0200 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version:1.0~pre.1495619642.e97a217 +Version:1.0~pre.1497939465.cb6f23f Release:0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++ product-builder.obsinfo ++ --- /var/tmp/diff_new_pack.vaFcRQ/_old 2017-06-26 15:52:43.223793696 +0200 +++ /var/tmp/diff_new_pack.vaFcRQ/_new 2017-06-26 15:52:43.223793696 +0200 @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1495619642.e97a217 -mtime: 1495619642 -commit: e97a217d968555d71f3bbb5fa23de56675be9ffc +version: 1.0~pre.1497939465.cb6f23f +mtime: 1497939465 +commit: cb6f23f74a8aa397af9024c7556b5a16c4533647
commit product-builder for openSUSE:Factory
Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2017-05-27 13:16:44 Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new (New) Package is "product-builder" Sat May 27 13:16:44 2017 rev:3 rq:497908 version:1.0~pre.1495619642.e97a217 Changes: --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2017-05-22 18:08:41.259832231 +0200 +++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes 2017-05-27 13:16:47.460856610 +0200 @@ -1,0 +2,5 @@ +Wed May 24 09:54:50 UTC 2017 - adr...@suse.de + +- adapt path of meta packages to /usr/lib/skeldcd/CD? (bsc#1031335) + +--- Old: product-builder-1.0~pre.1490686312.b24ea32.obscpio New: product-builder-1.0~pre.1495619642.e97a217.obscpio Other differences: -- ++ product-builder.spec ++ --- /var/tmp/diff_new_pack.8mADG0/_old 2017-05-27 13:16:48.060771797 +0200 +++ /var/tmp/diff_new_pack.8mADG0/_new 2017-05-27 13:16:48.064771231 +0200 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version:1.0~pre.1490686312.b24ea32 +Version:1.0~pre.1495619642.e97a217 Release:0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++ product-builder.obsinfo ++ --- /var/tmp/diff_new_pack.8mADG0/_old 2017-05-27 13:16:48.120763315 +0200 +++ /var/tmp/diff_new_pack.8mADG0/_new 2017-05-27 13:16:48.124762750 +0200 @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1490686312.b24ea32 -mtime: 1490686312 -commit: b24ea325287cea2480d15a97d7531f6ee5a4f39c +version: 1.0~pre.1495619642.e97a217 +mtime: 1495619642 +commit: e97a217d968555d71f3bbb5fa23de56675be9ffc
commit product-builder for openSUSE:Factory
Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-05-22 18:08:38
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
Package is "product-builder"
Mon May 22 18:08:38 2017 rev:2 rq:497150 version:1.0~pre.1490686312.b24ea32
Changes:
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-05-06 18:29:28.804678250 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-05-22 18:08:41.259832231 +0200
@@ -1,0 +2,5 @@
+Fri Apr 28 16:49:07 UTC 2017 - jeng...@inai.de
+
+- Stop using old RPM shell vars
+
+---
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.rAGUP6/_old 2017-05-22 18:08:41.815753870 +0200
+++ /var/tmp/diff_new_pack.rAGUP6/_new 2017-05-22 18:08:41.819753305 +0200
@@ -62,14 +62,14 @@
%build
test -e /.buildenv && . /.buildenv
-make buildroot=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS"
+make buildroot="%{buildroot}" CFLAGS="%{optflags}"
%install
-make buildroot=$RPM_BUILD_ROOT \
-doc_prefix=$RPM_BUILD_ROOT/%{_defaultdocdir} \
-man_prefix=$RPM_BUILD_ROOT/%{_mandir} \
+make buildroot="%{buildroot}" \
+doc_prefix="%{buildroot}/%{_defaultdocdir}" \
+man_prefix="%{buildroot}/%{_mandir}" \
install
-./.version > $RPM_BUILD_ROOT%{_datadir}/kiwi/.revision
+./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
%files
%defattr(-, root, root)
