12
0

Accepting request 932551 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/932551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=147
This commit is contained in:
2021-11-20 21:47:57 +00:00
committed by Git OBS Bridge
4 changed files with 38 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:01b93c2f2ae8b6126fedea188f6174671411ea69d38d67ec7f62c8a5e5284665
size 243364

View File

@@ -1,3 +1,24 @@
--------------------------------------------------------------------
Fri Nov 19 14:24:14 UTC 2021 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#543
- clean up Xorg config (bsc#1192678)
- 17.22
--------------------------------------------------------------------
Thu Nov 18 15:03:26 UTC 2021 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#542
- fix spec file
- 17.21
--------------------------------------------------------------------
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

View File

@@ -103,6 +103,10 @@ ExclusiveArch: do_not_build
%endif
%endif
%if "%flavor" == "LeapMicro"
%define theme LeapMicro
%endif
%if "%flavor" == "MicroOS"
# don't build on Leap for now
%if 0%{?is_opensuse} && !0%{?sle_version}
@@ -187,16 +191,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 +685,7 @@ AutoReqProv: off
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
Version: 17.19
Version: 17.22
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)