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 <[email protected]>
+
+- 1.2.7
+ * Fix possible partition misallignment (bsc#1162531)
+
+-------------------------------------------------------------------
+Thu Dec 12 11:07:17 UTC 2019 - Frederic Crozat <[email protected]>
+
+- 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 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/openSUSE/product-builder.git</param>
- <param name="revision">1.2.5</param>
- <param name="version">1.2.5</param>
+ <param name="revision">1.2.7</param>
+ <param name="version">1.2.7</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>
++++++ 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.sh 2019-09-18 13:03:17.000000000
+0200
+++ new/product-builder-1.2.7/SLE-wrapper.sh 2020-02-05 13:05:47.000000000
+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 (<STDIN>) { $in=1 if /<instrepo /; print $_ if $in;
$in=0 if m,</instrepo,; }' < $BUILD_FLAVOR.kiwi > 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.000000000 +0200
+++ new/product-builder-1.2.7/modules/KIWIIsoLinux.pm 2020-02-05
13:05:47.000000000 +0100
@@ -319,6 +319,7 @@
#------------------------------------------
KIWIQX::qxx ("echo $magicID > ".$this->{tmpdir}."/glump");
KIWIQX::qxx ("echo ".$this->{tmpdir}."/glump 1000000 >> $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 1000000 >> $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.gRUo4M/_old 2020-02-14 16:26:27.323225852 +0100
+++ /var/tmp/diff_new_pack.gRUo4M/_new 2020-02-14 16:26:27.323225852 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.5
-mtime: 1568804597
-commit: 3977b33e4bb79b990b80976291c3e4717589991e
+version: 1.2.7
+mtime: 1580904347
+commit: 2fa0d07906bffbde3df7cef265301ecd08d85027