pool/installation-images
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 493015 from system:install:head

Browse Source 
submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/493015
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger
2017-05-06 18:46:24 +00:00
committed by Git OBS Bridge
parent 12a54301aa d01ff32a95
commit a229ffbd06
5 changed files with 158 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
_multibuild Normal file
View File

@@ -0,0 +1,7 @@
<multibuild>
<package>openSUSE</package>
<package>SLES</package>
<package>SLED</package>
<package>CAASP</package>
<package>Kubic</package>
</multibuild>

3
installation-images-14.307.tar.xz
View File

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

3
installation-images-14.312.tar.xz Normal file
View File

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

59
installation-images.changes
View File

@@ -1,3 +1,62 @@
--------------------------------------------------------------------
Fri May 5 13:20:12 UTC 2017 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#181
- added Kubic theme
- rename skelcd-control-CASP to *-CAASP
- calculate driver update path for Kubic release
- 14.312
-------------------------------------------------------------------
Fri Apr 28 16:44:27 CEST 2017 - snwint@suse.de
- fix spec file
--------------------------------------------------------------------
Fri Apr 28 13:04:18 UTC 2017 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#179
- add Mesa-libGL1 (bsc#1035770)
- 14.311
--------------------------------------------------------------------
Wed Apr 26 12:21:03 UTC 2017 - wfeldt@opensuse.org
- enhance documentation
- add password bug warning
- merge gh#openSUSE/installation-images#178
- some doc adjustments
- 14.310
--------------------------------------------------------------------
Tue Apr 25 13:19:29 UTC 2017 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#177
- add dwc2 module (bsc#1035999)
- 14.309
--------------------------------------------------------------------
Fri Apr 21 14:57:47 UTC 2017 - lslezak@suse.cz
- merge gh#openSUSE/installation-images#176
- Ignore python2-setuptools package instead of python-setuptools
- 14.308
-------------------------------------------------------------------
Tue Apr 18 10:32:05 UTC 2017 - lslezak@suse.cz
- SLED fixes:
* build only on x86_64 (bsc#1034595)
* do not include the SAP installation wizard
-------------------------------------------------------------------
Tue Apr 11 16:03:29 CEST 2017 - snwint@suse.de
- change package name (again) to contain "-<THEME>" (fate#322275)
- use osc multibuild feature
- new skelcd-installer-<THEME> sub-package that will become the default
in the future (bsc#1031335)
-------------------------------------------------------------------
Wed Apr 5 09:05:29 UTC 2017 - snwint@suse.com

106
installation-images.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package installation-images
#
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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
@@ -18,6 +18,13 @@
# needsbinariesforbuild
%if "@BUILD_FLAVOR@" == ""
ExclusiveArch: do_not_build
%endif
# xxx
%global flavor @BUILD_FLAVOR@%nil
%define with_vbox 0
%define with_plymouth 1
%define with_shim 1
@@ -28,6 +35,22 @@
# === sort out branding ===
%if 0%{?is_opensuse}
%if "%flavor" == "Kubic"
%define theme Kubic
%define product_nameX %{theme}-%{_target_cpu}
%define branding_skelcd CAASP
%define branding_systemd CAASP
%define branding_plymouth openSUSE
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
BuildRequires: openSUSE-Kubic-release
%ifnarch s390x
BuildRequires: xf86-input-libinput
%endif
%else
%if "%flavor" != "openSUSE"
ExclusiveArch: do_not_build
%endif
%define theme openSUSE
%define product_nameX %{theme}-%{_target_cpu}
%define branding_skelcd openSUSE
@@ -39,11 +62,15 @@ BuildRequires: openSUSE-release
%ifnarch s390x
BuildRequires: xf86-input-libinput
%endif
%endif
%else
%if 0%{?is_susecaasp}
%if "%flavor" != "CAASP"
ExclusiveArch: do_not_build
%endif
%define theme CAASP
%define product_nameX %{theme}-%{_target_cpu}
%define branding_skelcd CASP
%define branding_skelcd CAASP
%define branding_systemd CAASP
%define branding_plymouth SLE
%define branding_grub2 SLE
@@ -52,6 +79,10 @@ BuildRequires: xf86-input-libinput
BuildRequires: caasp-release
BuildRequires: caasp-release-DVD
%else
%if "%flavor" != "SLES" && "%flavor" != "SLED"
ExclusiveArch: do_not_build
%endif
%if "%flavor" == "SLES"
%define theme SLES
%define product_nameX %{theme}-%{_target_cpu}
%define branding_skelcd SLES
@@ -68,6 +99,23 @@ BuildRequires: sap-installation-wizard
%endif
%endif
%endif
%if "%flavor" == "SLED"
# SLED is x86_64 only
ExclusiveArch: x86_64
%define theme SLED
%define product_nameX %{theme}-%{_target_cpu}
%define branding_skelcd SLES
%define branding_systemd SLE
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
BuildRequires: sled-release
BuildRequires: sled-release-DVD
%if 0%{?sle_version} != 0130000
BuildRequires: sle12-desktop-migration
%endif
%endif
%endif
%endif
%global product_name %(bash %_sourcedir/product_name)-%{_target_cpu}
@@ -97,6 +145,7 @@ BuildRequires: libsmbios2
%endif
BuildRequires: Mesa
BuildRequires: Mesa-libEGL1
BuildRequires: Mesa-libGL1
BuildRequires: SuSEfirewall2
BuildRequires: aaa_base
BuildRequires: aaa_base-extras
@@ -160,6 +209,7 @@ BuildRequires: icewm-lite
BuildRequires: icmpinfo
BuildRequires: indic-fonts
BuildRequires: initviocons
BuildRequires: insserv-compat
BuildRequires: ipa-gothic-fonts
BuildRequires: iproute2
BuildRequires: iputils
@@ -420,27 +470,33 @@ BuildRequires: python-libstoragemgmt
# our images are not reproducible and it's taking time
#!BuildIgnore: build-compare
%if "@BUILD_FLAVOR@" == ""
# This package is never built - but it helps the bots seeing that this package
# is intentionally as messed up as it is
Name: installation-images
%else
Name: installation-images-%{theme}
%endif
AutoReqProv: off
ExcludeArch: %arm
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
Version: 14.307
Version: 14.312
Release: 0
Provides: installation-images-%theme = %version-%release
Source: %{name}-%{version}.tar.xz
Source1: %{name}-rpmlintrc
Provides: installation-images = %version-%release
Source: installation-images-%{version}.tar.xz
Source1: installation-images-rpmlintrc
Source2: product_name
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
%description
%description -n installation-images-%{theme}
Files needed for %theme installation media.
%package -n install-initrd
Provides: install-initrd-%theme = %version-%release
%package -n install-initrd-%{theme}
Provides: install-initrd = %version-%release
Obsoletes: install-initrd-%theme < %version-%release
Obsoletes: install-initrd-branding-%theme < %version-%release
AutoReqProv: off
@@ -448,7 +504,7 @@ Summary: Create initrd for %theme installation
Group: System/Kernel
PreReq: /bin/ln
%description -n install-initrd
%description -n install-initrd-%{theme}
You can create an initrd for %theme installation. Useful, for example, to set
up a UML or XEN environment.
@@ -458,20 +514,29 @@ 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
%package -n skelcd-installer-%{theme}
AutoReqProv: off
Summary: installer and related files needed on dvd1
Group: Metapackages
%description -n skelcd-installer-%{theme}
This package contains kernel, initrd and installation images
needed on the first product dvds to start an installation.
%package -n installation-images-debuginfodeps-%{theme}
Provides: installation-images-debuginfodeps = %version-%release
Obsoletes: installation-images-debuginfodeps-%theme < %version-%release
Summary: Debuginfo dependencies for %theme installation-images
Group: Metapackages
%description -n installation-images-debuginfodeps
%description -n installation-images-debuginfodeps-%{theme}
Package that holds debuginfo dependencies for image files in installation-image.
@@ -547,8 +612,11 @@ echo '%defattr(-,root,root)' >install-initrd.files
echo '%ghost' /usr/lib/install-initrd/branding >>install-initrd.files
echo '%dir' /usr/lib/install-initrd >>install-initrd.files
echo /usr/sbin/mkinstallinitrd >>install-initrd.files
mkdir -p %{buildroot}/usr/lib/skelcd/CD1
cp -a %{buildroot}/srv/tftpboot/*/* %{buildroot}/usr/lib/skelcd/CD1
rm -rf %{buildroot}/usr/lib/skelcd/CD1/{README,net}
%post -n install-initrd
%post -n install-initrd-%{theme}
/bin/ln -snf %theme /usr/lib/install-initrd/branding 2>/dev/null || true
%clean
@@ -561,14 +629,18 @@ rm -rf %{buildroot}
%exclude /usr/share/debuginfodeps
/usr/share
%files -n install-initrd -f install-initrd.files
%files -n install-initrd-%{theme} -f install-initrd.files
%files -n tftpboot-installation-%{product_name}
%defattr(-,root,root)
%dir %attr(0750,tftp,tftp) /srv/tftpboot
/srv/tftpboot
%files -n installation-images-debuginfodeps
%files -n skelcd-installer-%{theme}
%defattr(-,root,root)
/usr/lib/skelcd/CD1
%files -n installation-images-debuginfodeps-%{theme}
%defattr(-,root,root)
/usr/share/debuginfodeps