From 83e42747ef897078d3077f45e618003d2f09329b48b0db75b7e2fd5b6d7aa078 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 18 Nov 2021 13:12:22 +0000 Subject: [PATCH] - release 17.20 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1417 --- installation-images-17.19.tar.xz | 3 --- installation-images-17.20.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 16 +++++++++++++--- 4 files changed, 23 insertions(+), 6 deletions(-) delete mode 100644 installation-images-17.19.tar.xz create mode 100644 installation-images-17.20.tar.xz diff --git a/installation-images-17.19.tar.xz b/installation-images-17.19.tar.xz deleted file mode 100644 index c4f54d9..0000000 --- a/installation-images-17.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30f317995146bcae1b9765ee8dcaf1d41d882a26defc22d7d0326fc8938740f9 -size 243216 diff --git a/installation-images-17.20.tar.xz b/installation-images-17.20.tar.xz new file mode 100644 index 0000000..2aa32ec --- /dev/null +++ b/installation-images-17.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fce511f73d5df598478be85d35d7d3064eb62c78ae91e70c546683728e4bd1c +size 243332 diff --git a/installation-images.changes b/installation-images.changes index 48300f9..7247d5c 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Thu Nov 18 13:09:50 UTC 2021 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#541 +- Leap Micro support +- 17.20 + -------------------------------------------------------------------- Wed Nov 10 16:58:24 UTC 2021 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 5e15ada..ec62e61 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -101,6 +101,9 @@ ExclusiveArch: do_not_build %endif %endif %endif + +%if "%flavor" == "LeapMicro" +%define theme LeapMicro %endif %if "%flavor" == "MicroOS" @@ -187,16 +190,23 @@ BuildRequires: distribution-logos-openSUSE-Kubic %global product_name openSUSE-Kubic %endif -%if "%theme" == "SMO" +%if "%theme" == "SMO" || "%theme" == "LeapMicro" %define with_storage_ng 1 %define with_ssl_hmac 0 %define branding_skelcd SMO %define branding_systemd SMO +%if "%theme" == "LeapMicro" +BuildRequires: Leap-Micro-release Leap-Micro-release-dvd +%define branding_plymouth openSUSE +%define branding_grub2 openSUSE +%define branding_gfxboot openSUSE +%else +BuildRequires: SUSE-MicroOS-release %define branding_plymouth SLE %define branding_grub2 SLE %define branding_gfxboot SLE +%endif %define config_bootmenu_no_upgrade 1 -BuildRequires: SUSE-MicroOS-release # system-group-kvm needed for 15-SP2 based MicroOS BuildRequires: system-group-kvm %endif @@ -674,7 +684,7 @@ AutoReqProv: off Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 17.19 +Version: 17.20 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)