Accepting request 610048 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/610048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2018-05-23 14:06:50 +00:00 committed by Git OBS Bridge
commit 8445092c97
4 changed files with 19 additions and 4 deletions

View File

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

View File

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

View File

@ -1,3 +1,10 @@
--------------------------------------------------------------------
Thu May 17 10:40:49 UTC 2018 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#250
- use reiserfs-kmp (fate#323394)
- 14.373
-------------------------------------------------------------------- --------------------------------------------------------------------
Mon May 14 10:20:53 UTC 2018 - tchvatal@suse.com Mon May 14 10:20:53 UTC 2018 - tchvatal@suse.com

View File

@ -28,6 +28,7 @@ ExclusiveArch: do_not_build
%define with_plymouth 1 %define with_plymouth 1
%define with_shim 1 %define with_shim 1
%define with_storage_ng 1 %define with_storage_ng 1
%define with_reiserfs_kmp 0
%bcond_without sbl %bcond_without sbl
%bcond_without vnc %bcond_without vnc
%bcond_with xen %bcond_with xen
@ -112,6 +113,7 @@ BuildRequires: openSUSE-Tumbleweed-Kubic-release
%endif %endif
%if "%theme" == "SLED" %if "%theme" == "SLED"
%define with_reiserfs_kmp 1
%define branding_skelcd leanos %define branding_skelcd leanos
%define branding_systemd SLE %define branding_systemd SLE
%define branding_plymouth SLE %define branding_plymouth SLE
@ -121,6 +123,7 @@ BuildRequires: unified-installer-release
%endif %endif
%if "%theme" == "SLES" %if "%theme" == "SLES"
%define with_reiserfs_kmp 1
%define branding_skelcd leanos %define branding_skelcd leanos
%define branding_systemd SLE %define branding_systemd SLE
%define branding_plymouth SLE %define branding_plymouth SLE
@ -130,6 +133,7 @@ BuildRequires: unified-installer-release
%endif %endif
%if "%theme" == "SLES_SAP" %if "%theme" == "SLES_SAP"
%define with_reiserfs_kmp 1
%define branding_skelcd leanos %define branding_skelcd leanos
%define branding_systemd SLE %define branding_systemd SLE
%define branding_plymouth SLE %define branding_plymouth SLE
@ -139,6 +143,7 @@ BuildRequires: unified-installer-release
%endif %endif
%if "%theme" == "CAASP" %if "%theme" == "CAASP"
%define with_reiserfs_kmp 1
%define branding_skelcd CAASP %define branding_skelcd CAASP
%define branding_systemd CAASP %define branding_systemd CAASP
%define branding_plymouth SLE %define branding_plymouth SLE
@ -173,6 +178,9 @@ BuildRequires: grub2-branding-%branding_grub2
ExcludeArch: %ix86 ExcludeArch: %ix86
%endif %endif
%if %with_reiserfs_kmp
BuildRequires: reiserfs-kmp-default
%endif
%ifnarch s390x %ifnarch s390x
BuildRequires: xf86-input-libinput BuildRequires: xf86-input-libinput
%endif %endif
@ -511,7 +519,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme Summary: Installation Image Files for %theme
License: GPL-2.0+ License: GPL-2.0+
Group: Metapackages Group: Metapackages
Version: 14.372 Version: 14.373
Release: 0 Release: 0
Provides: installation-images = %version-%release Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images) Conflicts: otherproviders(installation-images)