Accepting request 713594 from home:dimstar:Factory

- Complete the tftpboot subpackage rename for the Kubic flavor:
  also rename the directory inside tftpboot-installation, matching
  the package name.

OBS-URL: https://build.opensuse.org/request/show/713594
OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1234
This commit is contained in:
Steffen Winterfeldt 2019-07-05 11:47:01 +00:00 committed by Git OBS Bridge
parent af1f6b15cc
commit a4b777a93f
2 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jul 5 10:33:30 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Complete the tftpboot subpackage rename for the Kubic flavor:
also rename the directory inside tftpboot-installation, matching
the package name.
--------------------------------------------------------------------
Fri Jul 5 08:22:04 UTC 2019 - wfeldt@opensuse.org

View File

@ -722,6 +722,13 @@ test ! -z "$BUILD_DISTRIBUTION_NAME"
make install DESTDIR=%{buildroot} THEMES=%theme
# make debuginfo DESTDIR=%{buildroot}
make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=%theme
%if "%{flavor}" == "Kubic"
# openSUSE Kubic is a special case: it is openSUSE MicroOS, but with different control files
# In order to allow the MicroOS and Kubic tftpboot to co-exist, we rename the directory in
# case of flavor Kubic
mv %{buildroot}%{_datadir}/tftpboot-installation/openSUSE-MicroOS-%{_target_cpu} \
%{buildroot}%{_datadir}/tftpboot-installation/%{product_name}
%endif
ln -s %theme %{buildroot}/usr/lib/install-initrd/branding
install -d -m 755 %{buildroot}/usr/sbin
install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin