Provide the correct installkenrel and grubby-bls packaging for blscfg

Resolves: rhbz#1619344

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-10-23 14:27:58 +02:00 committed by Javier Martinez Canillas
parent 6a009b55ac
commit c8647003fc
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
2 changed files with 29 additions and 24 deletions

6
.gitignore vendored
View File

@ -1,6 +1,6 @@
grubby-*.tar.bz2 *.tar.bz2
*.tar.gz
clog clog
*.rpm *.rpm
/8.40-1.tar.gz
.build*log .build*log
grubby-*/ */

View File

@ -35,11 +35,9 @@ Requires: s390utils-base
%endif %endif
%description %description
grubby is a command line tool for updating and displaying information about This package provides a grubby compatibility script that manages
the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) BootLoaderSpec files and is meant to only be used for legacy compatibility
and zipl (s390) boot loaders. It is primarily designed to be used from scripts users with existing grubby users.
which install new kernels and need to find information about the current boot
environment.
%global debug_package %{nil} %global debug_package %{nil}
@ -75,35 +73,42 @@ sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/grubby,g" %{SOURCE2} \
sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE3} \ sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE3} \
> %{buildroot}%{_sbindir}/installkernel > %{buildroot}%{_sbindir}/installkernel
%package bls %package deprecated
Summary: Command line tool for updating BootLoaderSpec files Summary: Legacy command line tool for updating bootloader configs
Conflicts: %{name} <= 8.40-13 Conflicts: %{name} <= 8.40-13
BuildArch: noarch
%description bls %description deprecated
This package provides a grubby wrapper that manages BootLoaderSpec files and is This package provides deprecated, legacy grubby. This is for temporary
meant to only be used for legacy compatibility users with existing grubby users. compatibility only.
grubby is a command line tool for updating and displaying information about
the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc)
and zipl (s390) boot loaders. It is primarily designed to be used from
scripts which install new kernels and need to find information about the
current boot environment.
%files %files
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%dir %{_libexecdir}/grubby %dir %{_libexecdir}/grubby
%attr(0755,root,root) %{_libexecdir}/grubby/grubby
%dir %{_libexecdir}/installkernel %dir %{_libexecdir}/installkernel
%attr(0755,root,root) %{_libexecdir}/grubby/grubby-bls
%attr(0755,root,root) %{_sbindir}/grubby
%attr(0755,root,root) %{_sbindir}/installkernel
%{_mandir}/man8/[gi]*.8*
%files deprecated
%{!?_licensedir:%global license %%doc}
%license COPYING
%dir %{_libexecdir}/grubby
%dir %{_libexecdir}/installkernel
%attr(0755,root,root) %{_libexecdir}/grubby/grubby
%attr(0755,root,root) %{_libexecdir}/installkernel/installkernel %attr(0755,root,root) %{_libexecdir}/installkernel/installkernel
%attr(0755,root,root) %{_sbindir}/grubby %attr(0755,root,root) %{_sbindir}/grubby
%attr(0755,root,root) %{_sbindir}/installkernel %attr(0755,root,root) %{_sbindir}/installkernel
%attr(0755,root,root) %{_sbindir}/new-kernel-pkg %attr(0755,root,root) %{_sbindir}/new-kernel-pkg
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
%files bls
%{!?_licensedir:%global license %%doc}
%license COPYING
%dir %{_libexecdir}/grubby
%attr(0755,root,root) %{_libexecdir}/grubby/grubby-bls
%attr(0755,root,root) %{_sbindir}/grubby
%{_mandir}/man8/*.8*
%changelog %changelog
* Fri Aug 10 2018 Javier Martinez Canillas <javierm@redhat.com> - 8.40-18 * Fri Aug 10 2018 Javier Martinez Canillas <javierm@redhat.com> - 8.40-18
- Make installkernel to use kernel-install scripts on BLS configuration - Make installkernel to use kernel-install scripts on BLS configuration