pool/installation-images
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added ExcludeArch i586 (bnc #924024)

Browse Source 
- add grub2 to buildrequires for s390x (bnc #893971)
- handle xen & xen-kmp separately in spec file (bnc #906248)

- added ExcludeArch i586 (bnc #924024)
- add grub2 to buildrequires for s390x (bnc #893971)
- handle xen & xen-kmp separately in spec file (bnc #906248)

OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=796
This commit is contained in:
Steffen Winterfeldt 2015-04-01 12:41:37 +00:00 committed by Git OBS Bridge
parent d5a0d49fb2
commit 924e5f2fb3
4 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
installation-images-SLES.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 1 13:22:05 CEST 2015 - snwint@suse.de
- added ExcludeArch i586 (bnc #924024)
- add grub2 to buildrequires for s390x (bnc #893971)
- handle xen & xen-kmp separately in spec file (bnc #906248)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 24 17:57:52 CET 2015 - snwint@suse.com Tue Mar 24 17:57:52 CET 2015 - snwint@suse.com

16
installation-images-SLES.spec
View File

@ -31,14 +31,19 @@
%define with_shim 1 %define with_shim 1
%bcond_without sbl %bcond_without sbl
%bcond_without vnc %bcond_without vnc
%ifarch %ix86 %ifarch x86_64 %ix86
# FIXME: xen not working on i586
%bcond_without xen %bcond_without xen
%else %else
%bcond_without xen %bcond_with xen
%endif
%ifarch x86_64
%bcond_without xenkmp
%else
%bcond_with xenkmp
%endif %endif
%if %theme == SLES %if %theme == SLES
ExcludeArch: %ix86
BuildRequires: plymouth-theme-tribar BuildRequires: plymouth-theme-tribar
BuildRequires: sle12-desktop-migration BuildRequires: sle12-desktop-migration
BuildRequires: sles-release BuildRequires: sles-release
@ -62,6 +67,7 @@ BuildRequires: alsa-utils
BuildRequires: arabic-kacst-fonts BuildRequires: arabic-kacst-fonts
BuildRequires: audit-libs BuildRequires: audit-libs
BuildRequires: bc BuildRequires: bc
BuildRequires: bind-libs
BuildRequires: bind-utils BuildRequires: bind-utils
BuildRequires: blueprint-cursor-theme BuildRequires: blueprint-cursor-theme
BuildRequires: btrfsprogs BuildRequires: btrfsprogs
@ -269,7 +275,7 @@ BuildRequires: ipw-firmware
BuildRequires: tftp BuildRequires: tftp
%if %{with xen} %if %{with xen}
BuildRequires: kernel-xen BuildRequires: kernel-xen
%ifnarch %ix86 %if %{with xenkmp}
BuildRequires: xen-kmp-default BuildRequires: xen-kmp-default
%endif %endif
%else %else
@ -299,6 +305,7 @@ BuildRequires: xf86-video-r128
BuildRequires: xf86-video-sis BuildRequires: xf86-video-sis
BuildRequires: xf86-video-vesa BuildRequires: xf86-video-vesa
%endif %endif
BuildRequires: grub2
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
%ifnarch ppc64le %ifnarch ppc64le
BuildRequires: pdisk BuildRequires: pdisk
@ -313,7 +320,6 @@ BuildRequires: dhcp-client
BuildRequires: dmidecode BuildRequires: dmidecode
BuildRequires: elilo BuildRequires: elilo
BuildRequires: firmwarekit BuildRequires: firmwarekit
BuildRequires: grub2
BuildRequires: lilo BuildRequires: lilo
BuildRequires: memtest86+ BuildRequires: memtest86+
BuildRequires: syslinux BuildRequires: syslinux

7
installation-images-openSUSE.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 1 13:22:05 CEST 2015 - snwint@suse.de
- added ExcludeArch i586 (bnc #924024)
- add grub2 to buildrequires for s390x (bnc #893971)
- handle xen & xen-kmp separately in spec file (bnc #906248)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 24 17:57:52 CET 2015 - snwint@suse.com Tue Mar 24 17:57:52 CET 2015 - snwint@suse.com

16
installation-images-openSUSE.spec
View File

@ -31,14 +31,19 @@
%define with_shim 1 %define with_shim 1
%bcond_without sbl %bcond_without sbl
%bcond_without vnc %bcond_without vnc
%ifarch %ix86 %ifarch x86_64 %ix86
# FIXME: xen not working on i586
%bcond_without xen %bcond_without xen
%else %else
%bcond_without xen %bcond_with xen
%endif
%ifarch x86_64
%bcond_without xenkmp
%else
%bcond_with xenkmp
%endif %endif
%if %theme == SLES %if %theme == SLES
ExcludeArch: %ix86
BuildRequires: plymouth-theme-tribar BuildRequires: plymouth-theme-tribar
BuildRequires: sle12-desktop-migration BuildRequires: sle12-desktop-migration
BuildRequires: sles-release BuildRequires: sles-release
@ -62,6 +67,7 @@ BuildRequires: alsa-utils
BuildRequires: arabic-kacst-fonts BuildRequires: arabic-kacst-fonts
BuildRequires: audit-libs BuildRequires: audit-libs
BuildRequires: bc BuildRequires: bc
BuildRequires: bind-libs
BuildRequires: bind-utils BuildRequires: bind-utils
BuildRequires: blueprint-cursor-theme BuildRequires: blueprint-cursor-theme
BuildRequires: btrfsprogs BuildRequires: btrfsprogs
@ -269,7 +275,7 @@ BuildRequires: ipw-firmware
BuildRequires: tftp BuildRequires: tftp
%if %{with xen} %if %{with xen}
BuildRequires: kernel-xen BuildRequires: kernel-xen
%ifnarch %ix86 %if %{with xenkmp}
BuildRequires: xen-kmp-default BuildRequires: xen-kmp-default
%endif %endif
%else %else
@ -299,6 +305,7 @@ BuildRequires: xf86-video-r128
BuildRequires: xf86-video-sis BuildRequires: xf86-video-sis
BuildRequires: xf86-video-vesa BuildRequires: xf86-video-vesa
%endif %endif
BuildRequires: grub2
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
%ifnarch ppc64le %ifnarch ppc64le
BuildRequires: pdisk BuildRequires: pdisk
@ -313,7 +320,6 @@ BuildRequires: dhcp-client
BuildRequires: dmidecode BuildRequires: dmidecode
BuildRequires: elilo BuildRequires: elilo
BuildRequires: firmwarekit BuildRequires: firmwarekit
BuildRequires: grub2
BuildRequires: lilo BuildRequires: lilo
BuildRequires: memtest86+ BuildRequires: memtest86+
BuildRequires: syslinux BuildRequires: syslinux