Accepting request 232452 from openSUSE:Factory:PowerPC
- Remove lilo from BuildRequires - Fix gawk symlink in base - Require pdisk on ppc ppc64 OBS-URL: https://build.opensuse.org/request/show/232452 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=674
This commit is contained in:
parent
c74a1ad34f
commit
e70a94c569
15
gawk.patch
Normal file
15
gawk.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
Index: installation-images-14.86/data/base/base.file_list
|
||||||
|
===================================================================
|
||||||
|
--- installation-images-14.86.orig/data/base/base.file_list
|
||||||
|
+++ installation-images-14.86/data/base/base.file_list
|
||||||
|
@@ -118,6 +118,10 @@ yast2-trans-allpacks: requires,nodeps
|
||||||
|
x mk_yast2_trans bin/mk_yast2_trans
|
||||||
|
E mk_yast2_trans yast2-trans-allpacks.requires
|
||||||
|
|
||||||
|
+update-alternatives:ignore
|
||||||
|
+gawk:
|
||||||
|
+ /usr/bin/gawk
|
||||||
|
+ s gawk usr/bin/awk
|
||||||
|
|
||||||
|
:
|
||||||
|
|
@ -291,7 +291,9 @@ BuildRequires: tightvnc
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%ifarch ppc ppc64 ppc64le
|
%ifarch ppc ppc64 ppc64le
|
||||||
BuildRequires: lilo
|
%ifnarch ppc64le
|
||||||
|
BuildRequires: pdisk
|
||||||
|
%endif
|
||||||
BuildRequires: powerpc-utils
|
BuildRequires: powerpc-utils
|
||||||
BuildRequires: grub2-powerpc-ieee1275
|
BuildRequires: grub2-powerpc-ieee1275
|
||||||
%endif
|
%endif
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 2 15:15:10 UTC 2014 - dvaleev@suse.com
|
||||||
|
|
||||||
|
- Remove lilo from BuildRequires
|
||||||
|
- Fix gawk symlink in base
|
||||||
|
- Require pdisk on ppc ppc64
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 30 13:16:09 CEST 2014 - snwint@suse.de
|
Wed Apr 30 13:16:09 CEST 2014 - snwint@suse.de
|
||||||
|
|
||||||
|
@ -45,9 +45,6 @@ BuildRequires: sles-release-MINI
|
|||||||
BuildRequires: openSUSE-release
|
BuildRequires: openSUSE-release
|
||||||
BuildRequires: openSUSE-release-mini
|
BuildRequires: openSUSE-release-mini
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: sysvinit-tools
|
|
||||||
BuildRequires: haveged
|
|
||||||
BuildRequires: raleway-fonts
|
|
||||||
BuildRequires: Mesa
|
BuildRequires: Mesa
|
||||||
BuildRequires: Mesa-libEGL1
|
BuildRequires: Mesa-libEGL1
|
||||||
BuildRequires: aaa_base
|
BuildRequires: aaa_base
|
||||||
@ -99,6 +96,7 @@ BuildRequires: gpg2
|
|||||||
BuildRequires: gpm
|
BuildRequires: gpm
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: graphviz-gnome
|
BuildRequires: graphviz-gnome
|
||||||
|
BuildRequires: haveged
|
||||||
BuildRequires: hdparm
|
BuildRequires: hdparm
|
||||||
BuildRequires: hex
|
BuildRequires: hex
|
||||||
BuildRequires: hfsutils
|
BuildRequires: hfsutils
|
||||||
@ -112,9 +110,12 @@ BuildRequires: joe
|
|||||||
BuildRequires: kbd
|
BuildRequires: kbd
|
||||||
BuildRequires: kernel-default
|
BuildRequires: kernel-default
|
||||||
BuildRequires: kernel-firmware
|
BuildRequires: kernel-firmware
|
||||||
|
BuildRequires: raleway-fonts
|
||||||
|
BuildRequires: sysvinit-tools
|
||||||
%ifnarch ppc64le aarch64
|
%ifnarch ppc64le aarch64
|
||||||
BuildRequires: kexec-tools
|
BuildRequires: kexec-tools
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: kmod-compat
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: less
|
BuildRequires: less
|
||||||
BuildRequires: libpcsclite1
|
BuildRequires: libpcsclite1
|
||||||
@ -131,7 +132,6 @@ BuildRequires: mingetty
|
|||||||
BuildRequires: mkfontdir
|
BuildRequires: mkfontdir
|
||||||
BuildRequires: mkfontscale
|
BuildRequires: mkfontscale
|
||||||
BuildRequires: mkinitrd
|
BuildRequires: mkinitrd
|
||||||
BuildRequires: kmod-compat
|
|
||||||
BuildRequires: mtools
|
BuildRequires: mtools
|
||||||
BuildRequires: multipath-tools
|
BuildRequires: multipath-tools
|
||||||
BuildRequires: nasm
|
BuildRequires: nasm
|
||||||
@ -251,9 +251,9 @@ BuildRequires: xorg-x11-Xvnc
|
|||||||
BuildRequires: atmel-firmware
|
BuildRequires: atmel-firmware
|
||||||
BuildRequires: dos2unix
|
BuildRequires: dos2unix
|
||||||
BuildRequires: ftp
|
BuildRequires: ftp
|
||||||
|
BuildRequires: hyper-v
|
||||||
BuildRequires: ipw-firmware
|
BuildRequires: ipw-firmware
|
||||||
BuildRequires: tftp
|
BuildRequires: tftp
|
||||||
BuildRequires: hyper-v
|
|
||||||
%if %{with xen}
|
%if %{with xen}
|
||||||
BuildRequires: kernel-xen
|
BuildRequires: kernel-xen
|
||||||
BuildRequires: xen-kmp-default
|
BuildRequires: xen-kmp-default
|
||||||
@ -291,9 +291,11 @@ BuildRequires: tightvnc
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%ifarch ppc ppc64 ppc64le
|
%ifarch ppc ppc64 ppc64le
|
||||||
BuildRequires: lilo
|
%ifnarch ppc64le
|
||||||
BuildRequires: powerpc-utils
|
BuildRequires: pdisk
|
||||||
|
%endif
|
||||||
BuildRequires: grub2-powerpc-ieee1275
|
BuildRequires: grub2-powerpc-ieee1275
|
||||||
|
BuildRequires: powerpc-utils
|
||||||
%endif
|
%endif
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
BuildRequires: acpica
|
BuildRequires: acpica
|
||||||
@ -359,6 +361,7 @@ Version: 14.86
|
|||||||
Release: 0
|
Release: 0
|
||||||
Provides: installation-images = %version-%release
|
Provides: installation-images = %version-%release
|
||||||
Source: installation-images-14.86.tar.xz
|
Source: installation-images-14.86.tar.xz
|
||||||
|
Patch0: gawk.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%define _binary_payload w.ufdio
|
%define _binary_payload w.ufdio
|
||||||
|
|
||||||
@ -395,6 +398,7 @@ Package that holds debuginfo dependencies for image files in installation-image.
|
|||||||
%prep
|
%prep
|
||||||
%setup -n installation-images-%{version}
|
%setup -n installation-images-%{version}
|
||||||
rm -f /usr/lib/build/checks/04-check-filelist
|
rm -f /usr/lib/build/checks/04-check-filelist
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
unset MALLOC_CHECK_
|
unset MALLOC_CHECK_
|
||||||
|
Loading…
x
Reference in New Issue
Block a user