Accepting request 600018 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/600018
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger 2018-04-26 11:30:30 +00:00 committed by Git OBS Bridge
commit 8bc7302fee
4 changed files with 45 additions and 5 deletions

View File

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

View File

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

View File

@ -1,3 +1,40 @@
--------------------------------------------------------------------
Mon Apr 23 12:02:37 UTC 2018 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#245
- remove last mozilla-nspr reference
- 14.370
--------------------------------------------------------------------
Thu Apr 19 11:22:36 UTC 2018 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#244
- remove dmraid from inst-sys (fate#323743, bsc#1088570)
- remove explicit dependency from mozilla-nspr
- 14.369
--------------------------------------------------------------------
Wed Apr 18 12:57:09 UTC 2018 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#243
- run postin script of yast2-storage-ng (bsc#1081198)
- 14.368
-------------------------------------------------------------------
Wed Apr 11 15:49:43 CEST 2018 - snwint@suse.de
- disable Kubic 32-bit build (bsc#1089102)
-------------------------------------------------------------------
Mon Apr 9 15:00:54 CEST 2018 - kukuk@suse.de
- No upgrade option for Kubic (bsc#1088304)
-------------------------------------------------------------------
Mon Apr 9 14:44:58 CEST 2018 - snwint@suse.de
- do not delete efi image in skelcd-installer-net (bsc#1088679)
--------------------------------------------------------------------
Fri Apr 6 08:40:35 UTC 2018 - wfeldt@opensuse.org

View File

@ -49,9 +49,11 @@ ExclusiveArch: do_not_build
%if "%flavor" == "Kubic"
# don't build on Leap for now
%if 0%{?is_opensuse} && !0%{?sle_version}
%ifnarch %ix86
%define theme Kubic
%endif
%endif
%endif
%if "%flavor" == "SLED"
# build SLED only on x86_64
@ -105,6 +107,7 @@ BuildRequires: openSUSE-release
%define branding_plymouth openSUSE
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
%define config_bootmenu_no_upgrade 1
BuildRequires: openSUSE-Tumbleweed-Kubic-release
%endif
@ -508,7 +511,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
Version: 14.367
Version: 14.370
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
@ -664,7 +667,7 @@ rm -rf %{buildroot}/usr/lib/skelcd/CD1/{README,net}
# net
cp -a %{buildroot}/usr/lib/skelcd/CD1 %{buildroot}/usr/lib/skelcd/NET
rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/*.rpm
rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/{bind,common,config,control.xml,efi,gdb,libstoragemgmt,rescue,root}
rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/{bind,common,config,control.xml,gdb,libstoragemgmt,rescue,root}
if [ -n "%{net_repo}" ] ; then
CPU=%{_target_cpu}
[ "$CPU" = i586 ] && CPU=i386