From d62af0b3411b3cd4d7be404c15d770d4b02c3a453db6a7f40e29d62d4eb178c8 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 17 May 2018 10:40:07 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1142 --- installation-images.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/installation-images.spec b/installation-images.spec index a4ad3db..21c02ed 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -28,6 +28,7 @@ ExclusiveArch: do_not_build %define with_plymouth 1 %define with_shim 1 %define with_storage_ng 1 +%define with_reiserfs_kmp 0 %bcond_without sbl %bcond_without vnc %bcond_with xen @@ -112,6 +113,7 @@ BuildRequires: openSUSE-Tumbleweed-Kubic-release %endif %if "%theme" == "SLED" +%define with_reiserfs_kmp 1 %define branding_skelcd leanos %define branding_systemd SLE %define branding_plymouth SLE @@ -121,6 +123,7 @@ BuildRequires: unified-installer-release %endif %if "%theme" == "SLES" +%define with_reiserfs_kmp 1 %define branding_skelcd leanos %define branding_systemd SLE %define branding_plymouth SLE @@ -130,6 +133,7 @@ BuildRequires: unified-installer-release %endif %if "%theme" == "SLES_SAP" +%define with_reiserfs_kmp 1 %define branding_skelcd leanos %define branding_systemd SLE %define branding_plymouth SLE @@ -139,6 +143,7 @@ BuildRequires: unified-installer-release %endif %if "%theme" == "CAASP" +%define with_reiserfs_kmp 1 %define branding_skelcd CAASP %define branding_systemd CAASP %define branding_plymouth SLE @@ -173,6 +178,9 @@ BuildRequires: grub2-branding-%branding_grub2 ExcludeArch: %ix86 %endif +%if %with_reiserfs_kmp +BuildRequires: reiserfs-kmp-default +%endif %ifnarch s390x BuildRequires: xf86-input-libinput %endif From 62955de580d3278d0ac927d2087368b860d71589948e366d3d5f70edd74be2dd Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 17 May 2018 10:41:48 +0000 Subject: [PATCH 2/2] - release 14.373 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1143 --- installation-images-14.372.tar.xz | 3 --- installation-images-14.373.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.372.tar.xz create mode 100644 installation-images-14.373.tar.xz diff --git a/installation-images-14.372.tar.xz b/installation-images-14.372.tar.xz deleted file mode 100644 index 7bda7e5..0000000 --- a/installation-images-14.372.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9ed3a806168c51f1c275f90bf92b54002150c6fd764cf005362757e6da06a4b -size 174628 diff --git a/installation-images-14.373.tar.xz b/installation-images-14.373.tar.xz new file mode 100644 index 0000000..d570010 --- /dev/null +++ b/installation-images-14.373.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6224c810061c460617f2c23c5ddb622741f8fe7974e207239ac15a968873e804 +size 174660 diff --git a/installation-images.changes b/installation-images.changes index 6aca46a..907b519 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -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 diff --git a/installation-images.spec b/installation-images.spec index 21c02ed..751d729 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -519,7 +519,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.372 +Version: 14.373 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)