Accepting request 691554 from system:install:head

- Add MicroOS flavor in addition to MicroOS theme introduced on Apr 1 (forwarded request 691458 from RBrownSUSE)

OBS-URL: https://build.opensuse.org/request/show/691554
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2019-04-08 18:52:00 +00:00 committed by Git OBS Bridge
commit fdf8024ce7
5 changed files with 72 additions and 6 deletions

View File

@ -3,5 +3,5 @@
<package>SLES</package> <package>SLES</package>
<package>CAASP</package> <package>CAASP</package>
<package>Kubic</package> <package>Kubic</package>
<package>SLES_SAP</package> <package>MicroOS</package>
</multibuild> </multibuild>

View File

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

View File

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

View File

@ -1,3 +1,48 @@
-------------------------------------------------------------------
Thu Apr 4 09:55:08 UTC 2019 - Richard Brown <rbrown@suse.com>
- Add MicroOS flavor in addition to MicroOS theme introduced on Apr 1
-------------------------------------------------------------------
Thu Apr 4 08:15:06 UTC 2019 - Richard Brown <rbrown@suse.com>
- Add MicroOS to _multibuild
-------------------------------------------------------------------
Mon Apr 1 12:41:51 UTC 2019 - Richard Brown <rbrown@suse.com>
- Fix specfile for MicroOS flavour introduced in 14.418
-------------------------------------------------------------------
Fri Mar 29 15:19:30 UTC 2019 - snwint@suse.com
- disable SLES_SAP build (fcrozat)
--------------------------------------------------------------------
Thu Mar 28 14:13:23 UTC 2019 - snwint@suse.de
- merge gh#openSUSE/installation-images#306
- add more aarch64 modules (bsc#1129815)
- 14.420
--------------------------------------------------------------------
Thu Mar 28 13:41:46 UTC 2019 - snwint@suse.de
- merge gh#openSUSE/installation-images#305
- remove obsolete paragraph from doc
- update git2log to latest version
- inform user better about why things failed
- fix archive creation with detached git HEAD state
- 14.419
--------------------------------------------------------------------
Wed Mar 27 14:57:58 UTC 2019 - snwint@suse.de
- merge gh#openSUSE/installation-images#303
- Establish MicroOS as seperate media, with Kubic as a derivative
of MicroOS
- 14.418
-------------------------------------------------------------------- --------------------------------------------------------------------
Wed Mar 20 12:20:31 UTC 2019 - snwint@suse.de Wed Mar 20 12:20:31 UTC 2019 - snwint@suse.de

View File

@ -78,6 +78,15 @@ ExclusiveArch: do_not_build
%endif %endif
%endif %endif
%if "%flavor" == "MicroOS"
# don't build on Leap for now
%if 0%{?is_opensuse} && !0%{?sle_version}
%ifnarch %ix86
%define theme MicroOS
%endif
%endif
%endif
%if "%flavor" == "SLED" %if "%flavor" == "SLED"
# build SLED only on x86_64 # build SLED only on x86_64
%if "%{_target_cpu}" == "x86_64" && 0%{?sle_version} && !0%{?is_opensuse} %if "%{_target_cpu}" == "x86_64" && 0%{?sle_version} && !0%{?is_opensuse}
@ -132,7 +141,19 @@ BuildRequires: adobe-sourcesanspro-fonts
%define branding_grub2 openSUSE %define branding_grub2 openSUSE
%define branding_gfxboot openSUSE %define branding_gfxboot openSUSE
%define config_bootmenu_no_upgrade 1 %define config_bootmenu_no_upgrade 1
BuildRequires: openSUSE-Tumbleweed-Kubic-release BuildRequires: openSUSE-MicroOS-release
BuildRequires: adobe-sourcesanspro-fonts
%endif
%if "%theme" == "MicroOS"
%define with_storage_ng 1
%define branding_skelcd MicroOS
%define branding_systemd MicroOS
%define branding_plymouth openSUSE
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
%define config_bootmenu_no_upgrade 1
BuildRequires: openSUSE-MicroOS-release
BuildRequires: adobe-sourcesanspro-fonts BuildRequires: adobe-sourcesanspro-fonts
%endif %endif
@ -564,7 +585,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme Summary: Installation Image Files for %theme
License: GPL-2.0+ License: GPL-2.0+
Group: Metapackages Group: Metapackages
Version: 14.417 Version: 14.420
Release: 0 Release: 0
Provides: installation-images = %version-%release Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images) Conflicts: otherproviders(installation-images)