- test %with_storage_ng flag so we can build against the new yast storage code directly
OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=952
This commit is contained in:
Steffen Winterfeldt
Git OBS Bridge
parent
6f4fc9cf73
commit
1831ab335f
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 16 14:15:09 CET 2016 - snwint@suse.de
|
||||
|
||||
- test %with_storage_ng flag so we can build against the new yast storage code directly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 9 15:40:34 CET 2016 - snwint@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package installation-images
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -31,53 +31,51 @@
|
||||
%define theme openSUSE
|
||||
%define branding openSUSE
|
||||
%define branding2 openSUSE
|
||||
BuildRequires: openSUSE-release
|
||||
BuildRequires: xf86-input-libinput
|
||||
BuildRequires: openSUSE-release
|
||||
BuildRequires: xf86-input-libinput
|
||||
%else
|
||||
%if 0%{?is_susecasp}
|
||||
%define theme CASP
|
||||
%define branding SLE
|
||||
%define branding2 CASP
|
||||
%define config_bootmenu_no_upgrade 1
|
||||
BuildRequires: casp-release
|
||||
BuildRequires: casp-release-DVD
|
||||
BuildRequires: casp-release
|
||||
BuildRequires: casp-release-DVD
|
||||
%else
|
||||
%define theme SLES
|
||||
%define branding SLE
|
||||
%define branding2 SLES
|
||||
BuildRequires: sles-release
|
||||
BuildRequires: sle12-desktop-migration
|
||||
BuildRequires: sle12-desktop-migration
|
||||
BuildRequires: sles-release
|
||||
%ifarch x86_64 ppc64le
|
||||
BuildRequires: sap-installation-wizard
|
||||
BuildRequires: sap-installation-wizard
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
BuildRequires: skelcd-control-%branding2
|
||||
BuildRequires: systemd-presets-branding-%branding
|
||||
BuildRequires: skelcd-control-%branding2
|
||||
BuildRequires: systemd-presets-branding-%branding
|
||||
%if %with_plymouth
|
||||
BuildRequires: plymouth-branding-%branding
|
||||
BuildRequires: plymouth-branding-%branding
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
BuildRequires: gfxboot-branding-%branding
|
||||
BuildRequires: gfxboot-branding-%branding
|
||||
%endif
|
||||
%ifarch %ix86 x86_64 aarch64
|
||||
BuildRequires: grub2-branding-%branding
|
||||
BuildRequires: grub2-branding-%branding
|
||||
%endif
|
||||
# === branding end ===
|
||||
|
||||
# no i586 in Leap
|
||||
%if %suse_version == 1315
|
||||
ExcludeArch: %ix86
|
||||
ExcludeArch: %ix86
|
||||
%endif
|
||||
|
||||
BuildRequires: google-roboto-fonts
|
||||
BuildRequires: noto-sans-fonts
|
||||
BuildRequires: google-roboto-fonts
|
||||
%ifarch ia64 %ix86 x86_64
|
||||
BuildRequires: libsmbios2
|
||||
%endif
|
||||
BuildRequires: plymouth-theme-tribar
|
||||
BuildRequires: snapper
|
||||
BuildRequires: Mesa
|
||||
BuildRequires: Mesa-libEGL1
|
||||
BuildRequires: SuSEfirewall2
|
||||
@ -150,23 +148,14 @@ BuildRequires: joe
|
||||
BuildRequires: kbd
|
||||
BuildRequires: kernel-default
|
||||
BuildRequires: kernel-firmware
|
||||
BuildRequires: khmeros-fonts
|
||||
BuildRequires: libcryptsetup4-hmac
|
||||
BuildRequires: libgcrypt20-hmac
|
||||
BuildRequires: libopenssl1_0_0-hmac
|
||||
BuildRequires: lklug-fonts
|
||||
BuildRequires: nfs-kernel-server
|
||||
BuildRequires: openssh-fips
|
||||
BuildRequires: raleway-fonts
|
||||
BuildRequires: samba
|
||||
BuildRequires: sysvinit-tools
|
||||
BuildRequires: thai-fonts
|
||||
BuildRequires: vlan
|
||||
BuildRequires: vsftpd
|
||||
BuildRequires: kexec-tools
|
||||
BuildRequires: khmeros-fonts
|
||||
BuildRequires: kmod-compat
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: less
|
||||
BuildRequires: libcryptsetup4-hmac
|
||||
BuildRequires: libgcrypt20-hmac
|
||||
BuildRequires: libopenssl1_0_0-hmac
|
||||
BuildRequires: libpcsclite1
|
||||
BuildRequires: libyui-ncurses-pkg
|
||||
BuildRequires: libyui-qt
|
||||
@ -174,6 +163,7 @@ BuildRequires: libyui-qt-graph
|
||||
BuildRequires: libyui-qt-pkg
|
||||
BuildRequires: links
|
||||
BuildRequires: linuxrc
|
||||
BuildRequires: lklug-fonts
|
||||
BuildRequires: lsscsi
|
||||
BuildRequires: lvm2
|
||||
BuildRequires: mdadm
|
||||
@ -187,6 +177,7 @@ BuildRequires: ncurses-utils
|
||||
BuildRequires: netcat-openbsd
|
||||
BuildRequires: netpbm
|
||||
BuildRequires: nfs-client
|
||||
BuildRequires: nfs-kernel-server
|
||||
BuildRequires: nfs-utils
|
||||
BuildRequires: ntfs-3g
|
||||
BuildRequires: ntfsprogs
|
||||
@ -194,6 +185,7 @@ BuildRequires: open-iscsi
|
||||
BuildRequires: openldap2-client
|
||||
BuildRequires: openslp-server
|
||||
BuildRequires: openssh
|
||||
BuildRequires: openssh-fips
|
||||
BuildRequires: pango
|
||||
BuildRequires: pango-tools
|
||||
BuildRequires: parted
|
||||
@ -210,17 +202,27 @@ BuildRequires: perl-XML-Parser
|
||||
BuildRequires: perl-XML-Simple
|
||||
BuildRequires: perl-solv
|
||||
BuildRequires: pinentry
|
||||
BuildRequires: plymouth-theme-tribar
|
||||
BuildRequires: raleway-fonts
|
||||
BuildRequires: samba
|
||||
BuildRequires: snapper
|
||||
BuildRequires: suse-module-tools
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-presets-branding
|
||||
BuildRequires: sysvinit-tools
|
||||
BuildRequires: thai-fonts
|
||||
BuildRequires: tunctl
|
||||
BuildRequires: udev
|
||||
BuildRequires: vlan
|
||||
BuildRequires: vsftpd
|
||||
%if %with_plymouth
|
||||
BuildRequires: plymouth
|
||||
BuildRequires: plymouth-branding
|
||||
BuildRequires: plymouth-plugin-script
|
||||
BuildRequires: plymouth-scripts
|
||||
%endif
|
||||
BuildRequires: klogd
|
||||
BuildRequires: ltrace
|
||||
BuildRequires: nscd
|
||||
BuildRequires: polkit
|
||||
BuildRequires: popt-devel
|
||||
@ -234,6 +236,7 @@ BuildRequires: reiserfs
|
||||
BuildRequires: rgb
|
||||
BuildRequires: rpcbind
|
||||
BuildRequires: rsync
|
||||
BuildRequires: rsyslog
|
||||
BuildRequires: screen
|
||||
BuildRequires: sdparm
|
||||
BuildRequires: setserial
|
||||
@ -245,8 +248,6 @@ BuildRequires: socat
|
||||
BuildRequires: sqlite3
|
||||
BuildRequires: squashfs
|
||||
BuildRequires: strace
|
||||
BuildRequires: rsyslog
|
||||
BuildRequires: klogd
|
||||
BuildRequires: systemd-sysvinit
|
||||
BuildRequires: tcpd-devel
|
||||
BuildRequires: telnet
|
||||
@ -256,7 +257,6 @@ BuildRequires: terminfo
|
||||
BuildRequires: usbutils
|
||||
BuildRequires: util-linux
|
||||
BuildRequires: util-linux-systemd
|
||||
BuildRequires: ltrace
|
||||
BuildRequires: valgrind
|
||||
BuildRequires: vim
|
||||
BuildRequires: wget
|
||||
@ -284,6 +284,11 @@ BuildRequires: xterm
|
||||
BuildRequires: xz
|
||||
BuildRequires: yast2-devtools
|
||||
BuildRequires: yast2-trans-allpacks
|
||||
%if 0%{?with_storage_ng}
|
||||
BuildRequires: yast2-storage-ng
|
||||
#!BuildIgnore: yast2-storage
|
||||
#!BuildIgnore: libstorage7
|
||||
%endif
|
||||
%if %{with sbl}
|
||||
BuildRequires: sbl
|
||||
%endif
|
||||
@ -373,7 +378,7 @@ BuildRequires: ia32el
|
||||
%endif
|
||||
%ifarch s390x
|
||||
BuildRequires: glibc-32bit
|
||||
BuildRequires: s390-tools-hmcdrvfs
|
||||
BuildRequires: s390-tools-hmcdrvfs
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
BuildRequires: gfxboot-branding
|
||||
@ -389,9 +394,9 @@ BuildRequires: dmz-icon-theme-cursors
|
||||
BuildRequires: grub2-arm64-efi
|
||||
%endif
|
||||
# inst-sys module for libstoragemgmt
|
||||
BuildRequires: python-libstoragemgmt
|
||||
BuildRequires: libstoragemgmt-netapp-plugin
|
||||
BuildRequires: libstoragemgmt-smis-plugin
|
||||
BuildRequires: python-libstoragemgmt
|
||||
# our images are not reproducible and it's taking time
|
||||
#!BuildIgnore: build-compare
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user