hack for dominque
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=35
This commit is contained in:
parent
28ec07a7c8
commit
d5588a24dc
12
accept_old_meta_package.patch
Normal file
12
accept_old_meta_package.patch
Normal 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;
|
@ -27,6 +27,8 @@ 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}
|
||||
@ -60,6 +62,9 @@ and SLE 12.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if %suse_version == "1330"
|
||||
%patch1 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
test -e /.buildenv && . /.buildenv
|
||||
|
Loading…
Reference in New Issue
Block a user