Accepting request 500548 from system:install:head
submitted by snwint via jenkins OBS-URL: https://build.opensuse.org/request/show/500548 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
638dc9074a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:aa1257be6dff257d89579ee13caa7e2b7c08792f15ea36354bdc7abd91219e7e
|
||||
size 171744
|
||||
3
installation-images-14.317.tar.xz
Normal file
3
installation-images-14.317.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8237dae18b67b5020068ce47d9fc8a0e0a1a27891fb2c43a19647ca4338f2f78
|
||||
size 171972
|
||||
@ -1,3 +1,30 @@
|
||||
--------------------------------------------------------------------
|
||||
Fri Jun 2 08:02:07 UTC 2017 - jslaby@suse.cz
|
||||
|
||||
- merge gh#openSUSE/installation-images#186
|
||||
- etc: update module.config to match 4.12
|
||||
- 14.317
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 1 13:03:46 CEST 2017 - snwint@suse.de
|
||||
|
||||
- sle15: don't require obsolete sles-release-DVD package (bsc#1041893)
|
||||
|
||||
--------------------------------------------------------------------
|
||||
Tue May 30 11:34:00 UTC 2017 - wfeldt@opensuse.org
|
||||
|
||||
- merge gh#openSUSE/installation-images#185
|
||||
- allow driver updates also to be applied to the rescue system
|
||||
(bsc#1025621)
|
||||
- avoid build problems when different openssl versions exist
|
||||
- new skelcd-control-<BRANDING> packages have files in /usr/lib/skelcd
|
||||
- 14.316
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 29 10:16:28 CEST 2017 - snwint@suse.de
|
||||
|
||||
- rewrite spec file to simplify building different flavors (bsc#1039285)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 16 10:28:55 CEST 2017 - snwint@suse.de
|
||||
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
ExclusiveArch: do_not_build
|
||||
%endif
|
||||
|
||||
# xxx
|
||||
%global flavor @BUILD_FLAVOR@%nil
|
||||
|
||||
%define with_vbox 0
|
||||
@ -33,30 +32,47 @@ ExclusiveArch: do_not_build
|
||||
%bcond_with xen
|
||||
%bcond_with xenkmp
|
||||
|
||||
# === sort out branding ===
|
||||
# === sort out which flavor to build ===
|
||||
|
||||
%if "%flavor" == "openSUSE"
|
||||
%if 0%{?is_opensuse}
|
||||
%if "%flavor" == "Kubic"
|
||||
%if 0%{?sle_version}
|
||||
# don't build on Leap for now
|
||||
ExclusiveArch: do_not_build
|
||||
%endif
|
||||
%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}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%flavor" == "Kubic"
|
||||
# don't build on Leap for now
|
||||
%if 0%{?is_opensuse} && !0%{?sle_version}
|
||||
%define theme Kubic
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%flavor" == "SLED"
|
||||
# build SLED only on x86_64
|
||||
%if "%{_target_cpu}" == "x86_64" && 0%{?sle_version} && !0%{?is_opensuse}
|
||||
%define theme SLED
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%flavor" == "SLES"
|
||||
%if 0%{?sle_version} && !0%{?is_opensuse}
|
||||
%define theme SLES
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%flavor" == "CAASP"
|
||||
%if 0%{?is_susecaasp}
|
||||
%define theme CAASP
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# === define each theme ===
|
||||
|
||||
%if "%{?theme}" == ""
|
||||
ExclusiveArch: do_not_build
|
||||
%endif
|
||||
|
||||
%if "%theme" == "openSUSE"
|
||||
%define branding_skelcd openSUSE
|
||||
%define branding_systemd openSUSE
|
||||
%define branding_plymouth openSUSE
|
||||
@ -67,13 +83,49 @@ BuildRequires: openSUSE-release
|
||||
BuildRequires: xf86-input-libinput
|
||||
%endif
|
||||
%endif
|
||||
%else
|
||||
%if 0%{?is_susecaasp}
|
||||
%if "%flavor" != "CAASP"
|
||||
ExclusiveArch: do_not_build
|
||||
|
||||
%if "%theme" == "Kubic"
|
||||
%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
|
||||
%define theme CAASP
|
||||
%define product_nameX %{theme}-%{_target_cpu}
|
||||
%endif
|
||||
|
||||
%if "%theme" == "SLED"
|
||||
%define branding_skelcd SLED
|
||||
%define branding_systemd SLE
|
||||
%define branding_plymouth SLE
|
||||
%define branding_grub2 SLE
|
||||
%define branding_gfxboot SLE
|
||||
BuildRequires: sled-release
|
||||
%if 0%{?sle_version} != 0150000
|
||||
BuildRequires: sled-release-DVD
|
||||
BuildRequires: sle12-desktop-migration
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%theme" == "SLES"
|
||||
%define branding_skelcd SLES
|
||||
%define branding_systemd SLE
|
||||
%define branding_plymouth SLE
|
||||
%define branding_grub2 SLE
|
||||
%define branding_gfxboot SLE
|
||||
BuildRequires: sles-release
|
||||
%if 0%{?sle_version} != 0150000
|
||||
BuildRequires: sles-release-DVD
|
||||
BuildRequires: sle12-desktop-migration
|
||||
%ifarch x86_64 ppc64le
|
||||
BuildRequires: sap-installation-wizard
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%theme" == "CAASP"
|
||||
%define branding_skelcd CAASP
|
||||
%define branding_systemd CAASP
|
||||
%define branding_plymouth SLE
|
||||
@ -81,49 +133,17 @@ ExclusiveArch: do_not_build
|
||||
%define branding_gfxboot SLE
|
||||
%define config_bootmenu_no_upgrade 1
|
||||
BuildRequires: caasp-release
|
||||
%if 0%{?sle_version} != 0150000
|
||||
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
|
||||
%define branding_systemd SLE
|
||||
%define branding_plymouth SLE
|
||||
%define branding_grub2 SLE
|
||||
%define branding_gfxboot SLE
|
||||
BuildRequires: sles-release
|
||||
BuildRequires: sles-release-DVD
|
||||
%if 0%{?sle_version} != 0150000
|
||||
BuildRequires: sle12-desktop-migration
|
||||
%ifarch x86_64 ppc64le
|
||||
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 SLED
|
||||
%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} != 0150000
|
||||
BuildRequires: sle12-desktop-migration
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# === set product string (based on required packages) ===
|
||||
|
||||
%global product_name %(bash %_sourcedir/product_name)-%{_target_cpu}
|
||||
|
||||
# === branding specific packages ===
|
||||
|
||||
BuildRequires: skelcd-control-%branding_skelcd
|
||||
BuildRequires: systemd-presets-branding-%branding_systemd
|
||||
%if %with_plymouth
|
||||
@ -135,6 +155,7 @@ BuildRequires: gfxboot-branding-%branding_gfxboot
|
||||
%ifarch %ix86 x86_64 aarch64
|
||||
BuildRequires: grub2-branding-%branding_grub2
|
||||
%endif
|
||||
|
||||
# === branding end ===
|
||||
|
||||
# no i586 in Leap
|
||||
@ -487,7 +508,7 @@ ExcludeArch: %arm
|
||||
Summary: Installation Image Files for %theme
|
||||
License: GPL-2.0+
|
||||
Group: Metapackages
|
||||
Version: 14.315
|
||||
Version: 14.317
|
||||
Release: 0
|
||||
Provides: installation-images = %version-%release
|
||||
Source: installation-images-%{version}.tar.xz
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user