Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2018-03-04 11:55:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images" Sun Mar 4 11:55:14 2018 rev:38 rq:579045 version:14.359 Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2018-02-13 10:24:46.495099645 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2018-03-04 11:55:22.396162002 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Thu Feb 22 16:05:30 CET 2018 - snw...@suse.de + +- build skelcd-installer-net subpackage containing the network + install setup (bsc#1063789) + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.QyUTmj/_old 2018-03-04 11:55:25.344055883 +0100 +++ /var/tmp/diff_new_pack.QyUTmj/_new 2018-03-04 11:55:25.348055739 +0100 @@ -38,6 +38,11 @@ %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 @@ 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 '%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 @@ %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