commit product-builder for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-04-30 18:51:20
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.2738 (New)
Package is "product-builder"
Thu Apr 30 18:51:20 2020 rev:80 rq:797528 version:1.2.11
Changes:
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-04-21 19:08:09.668066800 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.2738/product-builder.changes
2020-04-30 18:51:27.004599377 +0200
@@ -1,0 +2,8 @@
+Fri Apr 24 07:56:50 UTC 2020 - Adrian Schröter
+
+- 1.2.11
+ * revert last change, basically going back to 1.2.9 (bsc#1169840)
+ * working on SLE_15_SP2 branch now to avoid incompatible changes
+in factory
+
+---
Old:
product-builder-1.2.10.obscpio
New:
product-builder-1.2.11.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.Ums14K/_old 2020-04-30 18:51:27.612600673 +0200
+++ /var/tmp/diff_new_pack.Ums14K/_new 2020-04-30 18:51:27.612600673 +0200
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2020 SUSE LLC
+# 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
@@ -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.10
+Version:1.2.11
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.Ums14K/_old 2020-04-30 18:51:27.640600732 +0200
+++ /var/tmp/diff_new_pack.Ums14K/_new 2020-04-30 18:51:27.640600732 +0200
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.10
-1.2.10
+1.2.11
+1.2.11
git
rpm/product-builder.spec
++ product-builder-1.2.10.obscpio -> product-builder-1.2.11.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.10/modules/KIWIIsoLinux.pm
new/product-builder-1.2.11/modules/KIWIIsoLinux.pm
--- old/product-builder-1.2.10/modules/KIWIIsoLinux.pm 2020-04-15
16:25:04.0 +0200
+++ new/product-builder-1.2.11/modules/KIWIIsoLinux.pm 2020-04-24
09:53:04.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.Ums14K/_old 2020-04-30 18:51:27.804601082 +0200
+++ /var/tmp/diff_new_pack.Ums14K/_new 2020-04-30 18:51:27.808601090 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.10
-mtime: 1586960704
-commit: e0a5d1c56acab2050ecbfdc3d7513e07a8a3fc11
+version: 1.2.11
+mtime: 1587714784
+commit: fab7e2bcf64fdd6a47244564d1243d0fae2395ee
commit product-builder for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-04-21 19:06:42
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.2738 (New)
Package is "product-builder"
Tue Apr 21 19:06:42 2020 rev:79 rq:795317 version:1.2.10
Changes:
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-03-20 05:52:21.584041635 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.2738/product-builder.changes
2020-04-21 19:08:09.668066800 +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.QYgEVP/_old 2020-04-21 19:08:10.072067623 +0200
+++ /var/tmp/diff_new_pack.QYgEVP/_new 2020-04-21 19:08:10.072067623 +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.QYgEVP/_old 2020-04-21 19:08:10.100067680 +0200
+++ /var/tmp/diff_new_pack.QYgEVP/_new 2020-04-21 19:08:10.100067680 +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.QYgEVP/_old 2020-04-21 19:08:10.236067957 +0200
+++ /var/tmp/diff_new_pack.QYgEVP/_new 2020-04-21 19:08:10.236067957 +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:Leap:15.2
Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-03-20 05:52:14
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.3160 (New)
Package is "product-builder"
Fri Mar 20 05:52:14 2020 rev:78 rq:781743 version:1.2.9
Changes:
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-03-02 17:21:51.750122939 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.3160/product-builder.changes
2020-03-20 05:52:21.584041635 +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.3cE1Yt/_old 2020-03-20 05:52:22.048041944 +0100
+++ /var/tmp/diff_new_pack.3cE1Yt/_new 2020-03-20 05:52:22.048041944 +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.7
+Version:1.2.9
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.3cE1Yt/_old 2020-03-20 05:52:22.072041960 +0100
+++ /var/tmp/diff_new_pack.3cE1Yt/_new 2020-03-20 05:52:22.072041960 +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.3cE1Yt/_old 2020-03-20 05:52:22.180042032 +0100
+++ /var/tmp/diff_new_pack.3cE1Yt/_new 2020-03-20 05:52:22.180042032 +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:Leap:15.2
Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-03-02 17:21:42
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092 (New)
Package is "product-builder"
Mon Mar 2 17:21:42 2020 rev:77 rq:780634 version:1.2.7
Changes:
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-03-01 08:51:32.729293731 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092/product-builder.changes
2020-03-02 17:21:51.750122939 +0100
@@ -2,6 +1,0 @@
-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.8.obscpio
New:
product-builder-1.2.7.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.Xf8maX/_old 2020-03-02 17:21:52.198123803 +0100
+++ /var/tmp/diff_new_pack.Xf8maX/_new 2020-03-02 17:21:52.198123803 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2020 SUSE LLC
+# 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
@@ -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.8
+Version:1.2.7
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.Xf8maX/_old 2020-03-02 17:21:52.218123841 +0100
+++ /var/tmp/diff_new_pack.Xf8maX/_new 2020-03-02 17:21:52.218123841 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.8
-1.2.8
+1.2.7
+1.2.7
git
rpm/product-builder.spec
++ product-builder-1.2.8.obscpio -> product-builder-1.2.7.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.8/SLE-wrapper.sh
new/product-builder-1.2.7/SLE-wrapper.sh
--- old/product-builder-1.2.8/SLE-wrapper.sh2020-02-26 14:21:02.0
+0100
+++ new/product-builder-1.2.7/SLE-wrapper.sh2020-02-05 13:05:47.0
+0100
@@ -11,7 +11,7 @@
mkdir $TOPDIR/KIWIRESULTS
# remove symlink, we cat into it
-rm -f config.xml config.kiwi
+rm config.xml
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
@@ -30,11 +30,8 @@
grep -qx $MN_SHORT packages-dvd.txt || continue
# replace obsrepositories://
- perl -e '$in=0; while () { $in=1 if / config.kiwi
- sed -i
"s,MEDIUM_NAME\">.*,MEDIUM_NAME\">$MN-$BUILD_SUFFIX-Media$MN-$BUILD_SUFFIX," config.kiwi
-
- # rescue support flags
- cp ${kiwi%.kiwi}.kwd config.kwd
+ 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
/usr/bin/product-builder.pl --root $TOPDIR/KIWIROOT/ -v 1 --logfile
terminal --create-instsource . || exit 1
mv $TOPDIR/KIWIROOT/main $TOPDIR/KIWIALL/$MN_SHORT
@@ -42,7 +39,7 @@
done # kiwiconf
# now the final ISO
-perl -e '$in=0; while () { $in=0 if m, config.kiwi
+perl -e '$in=0; while () { $in=0 if m, config.xml
;;
esac
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.Xf8maX/_old 2020-03-02 17:21:52.422124234 +0100
+++ /var/tmp/diff_new_pack.Xf8maX/_new 2020-03-02 17:21:52.426124242 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.8
-mtime: 1582723262
-commit: 341d31d4b6c311cbc6544d7284e9957033542247
+version: 1.2.7
+mtime: 1580904347
+commit: 2fa0d07906bffbde3df7cef265301ecd08d85027
commit product-builder for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-03-01 08:51:12
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092 (New)
Package is "product-builder"
Sun Mar 1 08:51:12 2020 rev:76 rq:779657 version:1.2.8
Changes:
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-02-16 18:25:43.754636606 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092/product-builder.changes
2020-03-01 08:51:32.729293731 +0100
@@ -1,0 +2,6 @@
+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.8.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.Z1I8ZH/_old 2020-03-01 08:51:33.281294829 +0100
+++ /var/tmp/diff_new_pack.Z1I8ZH/_new 2020-03-01 08:51:33.281294829 +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.7
+Version:1.2.8
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.Z1I8ZH/_old 2020-03-01 08:51:33.309294885 +0100
+++ /var/tmp/diff_new_pack.Z1I8ZH/_new 2020-03-01 08:51:33.309294885 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.7
-1.2.7
+1.2.8
+1.2.8
git
rpm/product-builder.spec
++ product-builder-1.2.7.obscpio -> product-builder-1.2.8.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.8/SLE-wrapper.sh
--- old/product-builder-1.2.7/SLE-wrapper.sh2020-02-05 13:05:47.0
+0100
+++ new/product-builder-1.2.8/SLE-wrapper.sh2020-02-26 14:21:02.0
+0100
@@ -11,7 +11,7 @@
mkdir $TOPDIR/KIWIRESULTS
# remove symlink, we cat into it
-rm config.xml
+rm -f config.xml config.kiwi
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
@@ -30,8 +30,11 @@
grep -qx $MN_SHORT packages-dvd.txt || continue
# replace obsrepositories://
- 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
+ perl -e '$in=0; while () { $in=1 if / config.kiwi
+ sed -i
"s,MEDIUM_NAME\">.*,MEDIUM_NAME\">$MN-$BUILD_SUFFIX-Media$MN-$BUILD_SUFFIX," config.kiwi
+
+ # 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
@@ -39,7 +42,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.kiwi
;;
esac
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.Z1I8ZH/_old 2020-03-01 08:51:33.493295251 +0100
+++ /var/tmp/diff_new_pack.Z1I8ZH/_new 2020-03-01 08:51:33.497295259 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.7
-mtime: 1580904347
-commit: 2fa0d07906bffbde3df7cef265301ecd08d85027
+version: 1.2.8
+mtime: 1582723262
+commit: 341d31d4b6c311cbc6544d7284e9957033542247
commit product-builder for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-02-16 18:25:41
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092 (New)
Package is "product-builder"
Sun Feb 16 18:25:41 2020 rev:75 rq:770327 version:1.2.7
Changes:
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-01-15 15:45:09.471313666 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092/product-builder.changes
2020-02-16 18:25:43.754636606 +0100
@@ -1,0 +2,6 @@
+Wed Feb 5 12:06:04 UTC 2020 - Adrian Schröter
+
+- 1.2.7
+ * Fix possible partition misallignment (bsc#1162531)
+
+---
Old:
product-builder-1.2.6.obscpio
New:
product-builder-1.2.7.obscpio
Other differences:
--
++ product-builder.spec ++
--- /var/tmp/diff_new_pack.59LJsk/_old 2020-02-16 18:25:44.194636836 +0100
+++ /var/tmp/diff_new_pack.59LJsk/_new 2020-02-16 18:25:44.194636836 +0100
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version:1.2.6
+Version:1.2.7
Release:0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++ _service ++
--- /var/tmp/diff_new_pack.59LJsk/_old 2020-02-16 18:25:44.222636851 +0100
+++ /var/tmp/diff_new_pack.59LJsk/_new 2020-02-16 18:25:44.222636851 +0100
@@ -1,8 +1,8 @@
https://github.com/openSUSE/product-builder.git
-1.2.6
-1.2.6
+1.2.7
+1.2.7
git
rpm/product-builder.spec
++ product-builder-1.2.6.obscpio -> product-builder-1.2.7.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.6/modules/KIWIIsoLinux.pm
new/product-builder-1.2.7/modules/KIWIIsoLinux.pm
--- old/product-builder-1.2.6/modules/KIWIIsoLinux.pm 2019-12-12
11:57:03.0 +0100
+++ 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 -> {xml};
my $magicID = $this -> {magicID};
-my $addpara = "-hide glump -hide-joliet glump";
my $firmware = 'efi';
my $ldir_cnt = 0;
my %type;
@@ -952,9 +953,9 @@
return;
}
if ($this -> isEmptyDir ($ldir)) {
-$cmdln = "$prog $para $addpara -o $dest $src 2>&1";
+$cmdln = "$prog $para -o $dest $src 2>&1";
} else {
-$cmdln = "$prog $para $addpara -o $dest $ldir $src 2>&1";
+$cmdln = "$prog $para -o $dest $ldir $src 2>&1";
}
$data = KIWIQX::qxx ( $cmdln );
$code = $? >> 8;
++ product-builder.obsinfo ++
--- /var/tmp/diff_new_pack.59LJsk/_old 2020-02-16 18:25:44.382636934 +0100
+++ /var/tmp/diff_new_pack.59LJsk/_new 2020-02-16 18:25:44.382636934 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.6
-mtime: 1576148223
-commit: 631248c87e26458e4ec6063df49a205933733812
+version: 1.2.7
+mtime: 1580904347
+commit: 2fa0d07906bffbde3df7cef265301ecd08d85027
