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 - [email protected] + +- Add accept_old_meta_package.patch: temporarily accept metadata + in /CD1 for tumbleweed to ease migration. + +------------------------------------------------------------------- +Mon Aug 21 14:47:29 UTC 2017 - [email protected] + +- 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 - [email protected] + +- fix metapackage unpack loop + +------------------------------------------------------------------- +Wed Aug 9 11:12:20 CEST 2017 - [email protected] + +- 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 - [email protected] + +- 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
