- build skelcd-installer-net subpackage containing the network

install setup (bsc#1063789)

OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1114
This commit is contained in:
Steffen Winterfeldt 2018-02-22 15:07:43 +00:00 committed by Git OBS Bridge
parent d74891c78e
commit 77579ea775
2 changed files with 51 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 22 16:05:30 CET 2018 - snwint@suse.de
- build skelcd-installer-net subpackage containing the network
install setup (bsc#1063789)
--------------------------------------------------------------------
Fri Feb 9 13:38:51 UTC 2018 - wfeldt@opensuse.org

View File

@ -38,6 +38,11 @@ ExclusiveArch: do_not_build
%if "%flavor" == "openSUSE"
%if 0%{?is_opensuse}
%define theme openSUSE
%if 0%{?sle_version}
%define net_repo http://download.opensuse.org/distribution/leap/15.0/repo/oss
%else
%define net_repo http://download.opensuse.org/tumbleweed/repo/oss
%endif
%endif
%endif
@ -552,6 +557,18 @@ This package contains kernel, initrd and installation images
needed on the first product dvds to start an installation.
%package -n skelcd-installer-net-%{theme}
Provides: skelcd-installer = %version-%release
Conflicts: otherproviders(skelcd-installer)
AutoReqProv: off
Summary: installer and related files needed on network medium
Group: Metapackages
%description -n skelcd-installer-net-%{theme}
This package contains kernel, initrd and installation images
needed on the network install medium to start an installation.
%package -n installation-images-debuginfodeps-%{theme}
Provides: installation-images-debuginfodeps = %version-%release
Conflicts: otherproviders(installation-images-debuginfodeps)
@ -635,9 +652,30 @@ echo '%defattr(-,root,root)' >install-initrd.files
echo '%ghost' /usr/lib/install-initrd/branding >>install-initrd.files
echo '%dir' /usr/lib/install-initrd >>install-initrd.files
echo /usr/sbin/mkinstallinitrd >>install-initrd.files
# cd1
mkdir -p %{buildroot}/usr/lib/skelcd/CD1
cp -a %{buildroot}/srv/tftpboot/*/* %{buildroot}/usr/lib/skelcd/CD1
rm -f %{buildroot}/usr/lib/skelcd/CD1/boot/*/rpmlist
rm -f %{buildroot}/usr/lib/skelcd/CD1/boot/*/mkbootdisk
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}
if [ -n "%{net_repo}" ] ; then
CPU=%{_target_cpu}
[ "$CPU" = i586 ] && CPU=i386
RD=%{buildroot}/usr/lib/skelcd/NET/boot/$CPU/initrd
if [ ! -f $RD ] ; then
RD=%{buildroot}/usr/lib/skelcd/NET/boot/$CPU/loader/initrd
fi
if [ -f $RD ] ; then
mkdir -p tmp_xxx/etc/linuxrc.d
echo defaultrepo=%{net_repo} > tmp_xxx/etc/linuxrc.d/10_repo
( cd tmp_xxx ; find etc | cpio -o -H newc ) | xz --check=crc32 -c >> $RD
rm -rf tmp_xxx
fi
fi
%post -n install-initrd-%{theme}
/bin/ln -snf %theme /usr/lib/install-initrd/branding 2>/dev/null || true
@ -666,6 +704,13 @@ rm -rf %{buildroot}
%endif
/usr/lib/skelcd/CD1
%files -n skelcd-installer-net-%{theme}
%defattr(-,root,root)
%if 0%{?skelcd_compat}
%dir /usr/lib/skelcd
%endif
/usr/lib/skelcd/NET
%files -n installation-images-debuginfodeps-%{theme}
%defattr(-,root,root)
/usr/share/debuginfodeps