PR#3: Move grubby-bls to grubby and obsolete the old grubby package - rpms/grubby

rpms / grubby

#3 Move grubby-bls to grubby and obsolete the old grubby package

Closed 3 years ago by javierm. Opened 5 years ago by pjones.

rpms/ pjones/grubby f29-blsonly into master

Move grubby-bls to grubby and obsolete the old grubby package

Peter Jones • 5 years ago

c23df1d

grubby.in

file removed

-8

		`@@ -1,8 +0,0 @@`
		`- #!/bin/bash`
		`- if [[ -x @@LIBEXECDIR@@/grubby-bls ]] ; then`
		`- exec @@LIBEXECDIR@@/grubby-bls "${@}"`
		`- elif [[ -x @@LIBEXECDIR@@/grubby ]] ; then`
		`- exec @@LIBEXECDIR@@/grubby "${@}"`
		`- fi`
		`- echo "Grubby is not installed correctly." >>/dev/stderr`
		`- exit 1`

grubby.spec

file modified

+12 -29

		`@@ -1,16 +1,18 @@`
		`Name: grubby`
		`Version: 8.40`
		`- Release: 15%{?dist}`
		`+ Release: 16%{?dist}`
		`Summary: Command line tool for updating bootloader configs`
		`License: GPLv2+`
		`URL: https://github.com/rhinstaller/grubby`
		`+ Obsoletes: %{name} <= 8.40-16`
		`+ Obsoletes: %{name}-bls <= 8.40-16`
		`+`
		`# we only pull git snaps at the moment`
		`# git clone git@github.com:rhinstaller/grubby.git`
		`# git archive --format=tar --prefix=grubby-%%{version}/ HEAD \|bzip2 > grubby-%%{version}.tar.bz2`
		`# Source0: %%{name}-%%{version}.tar.bz2`
		`Source0: https://github.com/rhboot/grubby/archive/%{version}-1.tar.gz`
		`Source1: grubby-bls`
		`- Source2: grubby.in`
		`Patch1: drop-uboot-uImage-creation.patch`
		`Patch2: 0001-Change-return-type-in-getRootSpecifier.patch`
		`Patch3: 0002-Add-btrfs-subvolume-support-for-grub2.patch`
		`@@ -20,13 +22,14 @@`

		`BuildRequires: gcc`
		`BuildRequires: pkgconfig glib2-devel popt-devel`
		`- BuildRequires: libblkid-devel git-core sed`
		`+ BuildRequires: libblkid-devel git-core`
		`# for make test / getopt:`
		`BuildRequires: util-linux-ng`
		`%ifarch aarch64 i686 x86_64 %{power64}`
		`BuildRequires: grub2-tools-minimal`
		`Requires: grub2-tools-minimal`
		`Requires: grub2-tools`
		`+ Requires: sed`
		`%endif`
		`%ifarch s390 s390x`
		`Requires: s390utils-base`
		`@@ -64,40 +67,20 @@`
		`%install`
		`make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} sbindir=%{_sbindir}`

		`- mkdir -p %{buildroot}%{_libexecdir}/grubby/ %{buildroot}%{_sbindir}/`
		`- mv -v %{buildroot}%{_sbindir}/grubby %{buildroot}%{_libexecdir}/grubby/grubby`
		`- cp -v %{SOURCE1} %{buildroot}%{_libexecdir}/grubby/`
		`- sed -e "s,@@LIBEXECDIR@@,%{_libexecdir},g" %{SOURCE2} \`
		`- > %{buildroot}%{_sbindir}/grubby`
		`-`
		`- %package bls`
		`- Summary: Command line tool for updating BootLoaderSpec files`
		`- Conflicts: %{name} <= 8.40-13`
		`- BuildArch: noarch`
		`-`
		`- %description bls`
		`- This package provides a grubby wrapper that manages BootLoaderSpec files and is`
		`- meant to only be used for legacy compatibility users with existing grubby users.`
		`+ rm %{buildroot}%{_sbindir}/installkernel`
		`+ rm %{buildroot}%{_sbindir}/new-kernel-pkg`
		`+ cp %{SOURCE1} %{buildroot}%{_sbindir}/grubby`

		`%files`
		`%{!?_licensedir:%global license %%doc}`
		`%license COPYING`
		`- %dir %{_libexecdir}/grubby`
		`- %{_libexecdir}/grubby/grubby`
		`- %{_sbindir}/grubby`
		`- %{_sbindir}/installkernel`
		`- %{_sbindir}/new-kernel-pkg`
		`- %{_mandir}/man8/.8`
		`-`
		`- %files bls`
		`- %{!?_licensedir:%global license %%doc}`
		`- %license COPYING`
		`- %dir %{_libexecdir}/grubby`
		`- %{_libexecdir}/grubby/grubby-bls`
		`%{_sbindir}/grubby`
		`%{_mandir}/man8/.8`

		`%changelog`
		`+ * Wed Jul 18 2018 Peter Jones <pjones@redhat.com> - 8.40-16`
		`+ - Move grubby-bls to grubby and obsolete the old grubby package`
		`+`
		`* Fri Jul 13 2018 Javier Martinez Canillas <javierm@redhat.com> - 8.40-15`
		`- Add a grubby-bls package that conflicts with grubby`