pool/product-builder
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 521101 from openSUSE:Tools

Browse Source 
Add changes entry for the patch, so that the bot is happy (forwarded request 521076 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/521101
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/product-builder?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2017-09-07 20:12:55 +00:00 committed by Git OBS Bridge
commit 0535208552
6 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
accept_old_meta_package.patch Normal file
View File

@ -0,0 +1,12 @@
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;

3
product-builder-1.0~pre.1499777959.e6adac4.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2735ab339c7c8b98795245afcbc7c2b3b699e419b935ba23e71beceb63e781f
size 1305612

3
product-builder-1.0~pre.1503327890.95c265e.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7dd36dd7af1a230797a9fd37c80451851c169f2545bd0a657942230a85001dd5
size 1307148

30
product-builder.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Tue Sep 5 10:04:52 UTC 2017 - adrian@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 - adrian@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 - adrian@suse.de
- fix metapackage unpack loop
-------------------------------------------------------------------
Wed Aug 9 11:12:20 CEST 2017 - ro@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 - adrian@suse.de
- always exit on error (bsc#1052017)
-------------------------------------------------------------------
Tue Jul 11 12:34:47 UTC 2017 - adrian@suse.de

6
product-builder.obsinfo
View File

@ -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

10
product-builder.spec
View File

@ -23,10 +23,12 @@ Url: http://github.com/openSUSE/product-builder
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 @@ Requires: syslinux
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