Accepting request 800694 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/800694
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=97
This commit is contained in:
Dominique Leuenberger 2020-05-09 17:48:44 +00:00 committed by Git OBS Bridge
commit 9c36716dc6
4 changed files with 44 additions and 4 deletions

View File

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

View File

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

View File

@ -1,3 +1,22 @@
--------------------------------------------------------------------
Wed May 6 11:43:07 UTC 2020 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#374
- support MicroOSNG (bsc#1170885)
- 14.470
-------------------------------------------------------------------
Wed May 6 11:36:32 UTC 2020 - Steffen Winterfeldt <snwint@suse.com>
- prepare for MicroOSNG
--------------------------------------------------------------------
Mon May 4 12:17:22 UTC 2020 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#373
- beware of bash using update-alternatives
- 14.469
--------------------------------------------------------------------
Wed Apr 29 10:38:42 UTC 2020 - wfeldt@opensuse.org

View File

@ -85,6 +85,15 @@ ExclusiveArch: do_not_build
%endif
%endif
%if "%flavor" == "MicroOSNG"
# build for both Leap and SLE
%if 0%{?sle_version}
%ifnarch %ix86
%define theme MicroOSNG
%endif
%endif
%endif
%if "%flavor" == "MicroOS"
# don't build on Leap for now
%if 0%{?is_opensuse} && !0%{?sle_version}
@ -168,6 +177,18 @@ BuildRequires: distribution-logos-openSUSE-Kubic
%global product_name openSUSE-Kubic
%endif
%if "%theme" == "MicroOSNG"
%define with_storage_ng 1
%define with_ssl_hmac 0
%define branding_skelcd MicroOSNG
%define branding_systemd SLE
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
%define config_bootmenu_no_upgrade 1
BuildRequires: MicroOSNG-release
%endif
%if "%theme" == "MicroOS"
%define with_storage_ng 1
%define with_ssl_hmac 0
@ -616,7 +637,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
Version: 14.468
Version: 14.470
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)