From 0b428f20f30ba7bb46c8c764e29e14703e01a5a3 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 May 2019 20:40:21 -0400 Subject: [PATCH] Add grub2-mount to grub2-tools-minimal subpackage os-prober 1.75 dropped all the code for handling device mapper directly in favor of only supporting the use of grub2-mount. Thus, we now need grub2-mount to be built and packaged so that os-prober can depend on it. We ship it in the grub2-tools-minimal package to avoid creating a dependency loop between grub2-tools and os-prober. Resolves: rhbz#1471267 Signed-off-by: Neal Gompa --- grub.macros | 2 -- grub2.spec | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/grub.macros b/grub.macros index 94a50b7..d398f4e 100644 --- a/grub.macros +++ b/grub.macros @@ -329,7 +329,6 @@ PYTHON=python3 ./autogen.sh \ --target=%{1} \\\ --with-grubdir=%{name} \\\ --program-transform-name=s,grub,%{name}, \\\ - --disable-grub-mount \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After efi configure" \ @@ -414,7 +413,6 @@ cd grub-%{1}-%{tarversion} \ --target=%{_target_platform} \\\ --with-grubdir=%{name} \\\ --program-transform-name=s,grub,%{name}, \\\ - --disable-grub-mount \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After legacy configure" \ diff --git a/grub2.spec b/grub2.spec index 098deb7..62750f1 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 80%{?dist} +Release: 81%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -33,7 +33,7 @@ BuildRequires: gcc efi-srpm-macros BuildRequires: flex bison binutils python3 BuildRequires: ncurses-devel xz-devel bzip2-devel BuildRequires: freetype-devel libusb-devel -BuildRequires: rpm-devel +BuildRequires: fuse-devel BuildRequires: rpm-devel rpm-libs BuildRequires: autoconf automake autogen device-mapper-devel BuildRequires: freetype-devel gettext-devel git @@ -234,6 +234,7 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf # these have execstack, and break under selinux -b /usr/bin/grub2-script-check -b /usr/bin/grub2-mkrelpath +-b /usr/bin/grub2-mount -b /usr/bin/grub2-fstest -b /usr/sbin/grub2-bios-setup -b /usr/sbin/grub2-probe @@ -375,6 +376,7 @@ rm -r /boot/grub2.tmp/ || : %{_sbindir}/%{name}-set*password %{_bindir}/%{name}-editenv %{_bindir}/%{name}-mkpasswd-pbkdf2 +%{_bindir}/%{name}-mount %{_datadir}/man/man3/%{name}-get-kernel-settings* %{_datadir}/man/man8/%{name}-set-default* @@ -516,6 +518,10 @@ rm -r /boot/grub2.tmp/ || : %endif %changelog +* Fri May 03 2019 Neal Gompa - 2.02-81 +- Add grub2-mount to grub2-tools-minimal subpackage + Resolves: rhbz#1471267 + * Fri May 03 2019 Javier Martinez Canillas - 2.02-80 - Add grub2-emu subpackage