From e435fff39119f93f00539df3e47e1861b69e54eca013d721d357e838ac08a36c Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 11 Apr 2017 14:43:20 +0000 Subject: [PATCH] - change package name (again) to contain "-" (fate#322275) - use osc multibuild feature - new skelcd-installer- sub-package that will become the default in the future (bsc#1031335) OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1003 --- _multibuild | 6 +++ installation-images.changes | 8 ++++ installation-images.spec | 82 +++++++++++++++++++++++++++++-------- 3 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..dd635b5 --- /dev/null +++ b/_multibuild @@ -0,0 +1,6 @@ + + openSUSE + SLES + SLED + CAASP + diff --git a/installation-images.changes b/installation-images.changes index f8e16a9..e4dac98 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 11 16:03:29 CEST 2017 - snwint@suse.de + +- change package name (again) to contain "-" (fate#322275) +- use osc multibuild feature +- new skelcd-installer- sub-package that will become the default + in the future (bsc#1031335) + ------------------------------------------------------------------- Wed Apr 5 09:05:29 UTC 2017 - snwint@suse.com diff --git a/installation-images.spec b/installation-images.spec index 904d9ce..264f804 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -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,9 @@ # === sort out branding === %if 0%{?is_opensuse} +%if "%flavor" != "openSUSE" +ExclusiveArch: do_not_build +%endif %define theme openSUSE %define product_nameX %{theme}-%{_target_cpu} %define branding_skelcd openSUSE @@ -41,6 +51,9 @@ BuildRequires: xf86-input-libinput %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 @@ -52,6 +65,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 @@ -67,6 +84,23 @@ BuildRequires: sle12-desktop-migration BuildRequires: sap-installation-wizard %endif %endif +%else # %flavor" == "SLED" +%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 +%ifarch x86_64 ppc64le +BuildRequires: sap-installation-wizard +%endif +%endif +%endif %endif %endif @@ -420,7 +454,7 @@ BuildRequires: python-libstoragemgmt # our images are not reproducible and it's taking time #!BuildIgnore: build-compare -Name: installation-images +Name: installation-images-%{theme} AutoReqProv: off ExcludeArch: %arm Summary: Installation Image Files for %theme @@ -428,19 +462,19 @@ License: GPL-2.0+ Group: Metapackages Version: 14.307 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 +482,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 +492,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 +590,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 +607,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