Steffen Winterfeldt 2021-03-10 16:11:55 +00:00 committed by Git OBS Bridge
parent 99337a8321
commit e1d5c60c91
4 changed files with 29 additions and 4 deletions

View File

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

View File

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

View File

@ -1,3 +1,10 @@
--------------------------------------------------------------------
Wed Mar 10 16:11:26 UTC 2021 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#469
- Add bcond to build debug iso (boo#1183264)
- 16.55
--------------------------------------------------------------------
Wed Mar 10 14:59:54 UTC 2021 - wfeldt@opensuse.org

View File

@ -17,6 +17,9 @@
# needsrootforbuild
# needsbinariesforbuild
# This is for building a test iso for debugging. Note when building
# locally with osc you need --nopreinstallimage --userootforbuild
%bcond_with iso
# The files from i-i are, in parts, extracted and published in the FTP Tree
# Since they are all auto-generated files, so they keep on changing. Having the mtime
@ -641,6 +644,13 @@ BuildRequires: libstoragemgmt-smis-plugin
# our images are not reproducible and it's taking time
#!BuildIgnore: build-compare
%if %{with iso}
BuildRequires: createrepo_c
BuildRequires: mkisofs
BuildRequires: mksusecd
BuildRequires: skelcd-openSUSE
%endif
%if "@BUILD_FLAVOR@" == ""
# This package is never built - but it helps the bots seeing that this package
# is intentionally as messed up as it is
@ -652,7 +662,7 @@ AutoReqProv: off
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
Version: 16.54
Version: 16.55
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
@ -776,6 +786,10 @@ image=initrd-default kernel=kernel-default MOD_CFG=ppc64 make initrd+modules+gef
image=initrd-default kernel=kernel-default MOD_CFG=ppc64le make initrd+modules+gefrickel THEMES=%theme
%endif
%if %{with iso}
make THEMES=%theme iso
%endif
%install
BUILD_DISTRIBUTION_NAME="%distribution"
export BUILD_DISTRIBUTION_NAME
@ -829,6 +843,10 @@ if [ -n "%{net_repo}" ] ; then
fi
fi
%if %{with iso}
install -D -m 644 images/cd1.iso %{_topdir}/ISO/cd1.iso
%endif
%post -n install-initrd-%{theme}
/bin/ln -snf %theme /usr/lib/install-initrd/branding 2>/dev/null || true