Accepting request 453444 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/453444
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2017-02-04 14:16:06 +00:00 committed by Git OBS Bridge
commit e0962c297b
4 changed files with 48 additions and 5 deletions

View File

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

View File

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

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Jan 30 13:49:02 UTC 2017 - snwint@suse.com
- move grub file into x86_64-efi subdir to avoid issues mentioned in bsc#1022294
- copy tftp files into final position
- use cracklib-dict-full instead of cracklib-dict-small
- readme for x86_64
- generic readme for all architectures
- pxelinux startup message
- basic pxelinux config
- basic tftp grub2 config
- build tftp directory
- include sha256 sums of image files in initrd
- load control.xml from instsys location
- add tftp Makefile target
- add some more config settings to $ConfigData
- don't add package list if it's empty
- 14.297
-------------------------------------------------------------------
Thu Jan 19 11:28:37 UTC 2017 - snwint@suse.com

View File

@ -29,16 +29,20 @@
# === sort out branding ===
%if 0%{?is_opensuse}
%define theme openSUSE
%define product_name %{theme}-%{_target_cpu}
%define branding_skelcd openSUSE
%define branding_systemd openSUSE
%define branding_plymouth openSUSE
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
BuildRequires: openSUSE-release
%ifnarch s390x
BuildRequires: xf86-input-libinput
%endif
%else
%if 0%{?is_susecaasp}
%define theme CAASP
%define product_name %{theme}-%{_target_cpu}
%define branding_skelcd CASP
%define branding_systemd CAASP
%define branding_plymouth SLE
@ -49,6 +53,7 @@ BuildRequires: caasp-release
BuildRequires: caasp-release-DVD
%else
%define theme SLES
%define product_name %{theme}-%{_target_cpu}
%define branding_skelcd SLES
%define branding_systemd SLE
%define branding_plymouth SLE
@ -56,6 +61,7 @@ BuildRequires: caasp-release-DVD
%define branding_gfxboot SLE
BuildRequires: sle12-desktop-migration
BuildRequires: sles-release
BuildRequires: sles-release-DVD
%ifarch x86_64 ppc64le
BuildRequires: sap-installation-wizard
%endif
@ -94,6 +100,7 @@ BuildRequires: adaptec-firmware
BuildRequires: alsa
BuildRequires: alsa-utils
BuildRequires: arabic-kacst-fonts
BuildRequires: arphic-uming-fonts
BuildRequires: audit-libs
BuildRequires: bc
BuildRequires: bind-libs
@ -108,7 +115,7 @@ BuildRequires: cairo
BuildRequires: checkmedia
BuildRequires: cifs-utils
BuildRequires: cracklib
BuildRequires: cracklib-dict-small
BuildRequires: cracklib-dict-full
BuildRequires: cron
BuildRequires: cryptsetup
BuildRequires: cups-libs
@ -149,6 +156,7 @@ BuildRequires: icewm-lite
BuildRequires: icmpinfo
BuildRequires: indic-fonts
BuildRequires: initviocons
BuildRequires: ipa-gothic-fonts
BuildRequires: iproute2
BuildRequires: iputils
BuildRequires: iscsiuio
@ -264,6 +272,7 @@ BuildRequires: telnet
BuildRequires: telnet-server
BuildRequires: termcap
BuildRequires: terminfo
BuildRequires: un-fonts
BuildRequires: usbutils
BuildRequires: util-linux
BuildRequires: util-linux-systemd
@ -415,7 +424,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
Version: 14.296
Version: 14.297
Release: 0
Provides: installation-images-%theme = %version-%release
Source: %{name}-%{version}.tar.xz
@ -440,6 +449,18 @@ You can create an initrd for %theme installation. Useful, for example, to set
up a UML or XEN environment.
%package -n tftpboot-installation-%{product_name}
AutoReqProv: off
Summary: tftp installation tree
Group: System/Management
BuildArch: noarch
PreReq: /bin/ln
%description -n tftpboot-installation-%{product_name}
This package contains the kernel, initrd and installation images
to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64.
%package -n installation-images-debuginfodeps
Provides: installation-images-debuginfodeps-%theme = %version-%release
Obsoletes: installation-images-debuginfodeps-%theme < %version-%release
@ -533,6 +554,9 @@ rm -rf %{buildroot}
%files -n install-initrd -f install-initrd.files
%files -n tftpboot-installation-%{product_name}
/srv/tftp
%files -n installation-images-debuginfodeps
%defattr(-,root,root)
/usr/share/debuginfodeps