2021-11-18 13:12:22 +00:00
committed by Git OBS Bridge
parent 3552291b61
commit 83e42747ef
4 changed files with 23 additions and 6 deletions

View File

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

View File

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

View File

@@ -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 Wed Nov 10 16:58:24 UTC 2021 - wfeldt@opensuse.org

View File

@@ -101,6 +101,9 @@ ExclusiveArch: do_not_build
%endif %endif
%endif %endif
%endif %endif
%if "%flavor" == "LeapMicro"
%define theme LeapMicro
%endif %endif
%if "%flavor" == "MicroOS" %if "%flavor" == "MicroOS"
@@ -187,16 +190,23 @@ BuildRequires: distribution-logos-openSUSE-Kubic
%global product_name openSUSE-Kubic %global product_name openSUSE-Kubic
%endif %endif
%if "%theme" == "SMO" %if "%theme" == "SMO" || "%theme" == "LeapMicro"
%define with_storage_ng 1 %define with_storage_ng 1
%define with_ssl_hmac 0 %define with_ssl_hmac 0
%define branding_skelcd SMO %define branding_skelcd SMO
%define branding_systemd 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_plymouth SLE
%define branding_grub2 SLE %define branding_grub2 SLE
%define branding_gfxboot SLE %define branding_gfxboot SLE
%endif
%define config_bootmenu_no_upgrade 1 %define config_bootmenu_no_upgrade 1
BuildRequires: SUSE-MicroOS-release
# system-group-kvm needed for 15-SP2 based MicroOS # system-group-kvm needed for 15-SP2 based MicroOS
BuildRequires: system-group-kvm BuildRequires: system-group-kvm
%endif %endif
@@ -674,7 +684,7 @@ AutoReqProv: off
Summary: Installation Image Files for %theme Summary: Installation Image Files for %theme
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Metapackages Group: Metapackages
Version: 17.19 Version: 17.20
Release: 0 Release: 0
Provides: installation-images = %version-%release Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images) Conflicts: otherproviders(installation-images)