rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add grub2-mount to grub2-tools-minimal subpackage

Browse Source 
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 <ngompa13@gmail.com>
This commit is contained in:
Neal Gompa 2019-05-03 20:40:21 -04:00 committed by Javier Martinez Canillas
parent a18e8e631d
commit 0b428f20f3
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub.macros
View File

@ -329,7 +329,6 @@ PYTHON=python3 ./autogen.sh \
--target=%{1} \\\ --target=%{1} \\\
--with-grubdir=%{name} \\\ --with-grubdir=%{name} \\\
--program-transform-name=s,grub,%{name}, \\\ --program-transform-name=s,grub,%{name}, \\\
--disable-grub-mount \\\
--disable-werror || ( cat config.log ; exit 1 ) \ --disable-werror || ( cat config.log ; exit 1 ) \
git add . \ git add . \
git commit -m "After efi configure" \ git commit -m "After efi configure" \
@ -414,7 +413,6 @@ cd grub-%{1}-%{tarversion} \
--target=%{_target_platform} \\\ --target=%{_target_platform} \\\
--with-grubdir=%{name} \\\ --with-grubdir=%{name} \\\
--program-transform-name=s,grub,%{name}, \\\ --program-transform-name=s,grub,%{name}, \\\
--disable-grub-mount \\\
--disable-werror || ( cat config.log ; exit 1 ) \ --disable-werror || ( cat config.log ; exit 1 ) \
git add . \ git add . \
git commit -m "After legacy configure" \ git commit -m "After legacy configure" \

10
grub2.spec
View File

@ -7,7 +7,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 80%{?dist} Release: 81%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -33,7 +33,7 @@ BuildRequires: gcc efi-srpm-macros
BuildRequires: flex bison binutils python3 BuildRequires: flex bison binutils python3
BuildRequires: ncurses-devel xz-devel bzip2-devel BuildRequires: ncurses-devel xz-devel bzip2-devel
BuildRequires: freetype-devel libusb-devel BuildRequires: freetype-devel libusb-devel
BuildRequires: rpm-devel BuildRequires: fuse-devel
BuildRequires: rpm-devel rpm-libs BuildRequires: rpm-devel rpm-libs
BuildRequires: autoconf automake autogen device-mapper-devel BuildRequires: autoconf automake autogen device-mapper-devel
BuildRequires: freetype-devel gettext-devel git 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 # these have execstack, and break under selinux
-b /usr/bin/grub2-script-check -b /usr/bin/grub2-script-check
-b /usr/bin/grub2-mkrelpath -b /usr/bin/grub2-mkrelpath
-b /usr/bin/grub2-mount
-b /usr/bin/grub2-fstest -b /usr/bin/grub2-fstest
-b /usr/sbin/grub2-bios-setup -b /usr/sbin/grub2-bios-setup
-b /usr/sbin/grub2-probe -b /usr/sbin/grub2-probe
@ -375,6 +376,7 @@ rm -r /boot/grub2.tmp/ || :
%{_sbindir}/%{name}-set*password %{_sbindir}/%{name}-set*password
%{_bindir}/%{name}-editenv %{_bindir}/%{name}-editenv
%{_bindir}/%{name}-mkpasswd-pbkdf2 %{_bindir}/%{name}-mkpasswd-pbkdf2
%{_bindir}/%{name}-mount
%{_datadir}/man/man3/%{name}-get-kernel-settings* %{_datadir}/man/man3/%{name}-get-kernel-settings*
%{_datadir}/man/man8/%{name}-set-default* %{_datadir}/man/man8/%{name}-set-default*
@ -516,6 +518,10 @@ rm -r /boot/grub2.tmp/ || :
%endif %endif
%changelog %changelog
* Fri May 03 2019 Neal Gompa <ngompa13@gmail.com> - 2.02-81
- Add grub2-mount to grub2-tools-minimal subpackage
Resolves: rhbz#1471267
* Fri May 03 2019 Javier Martinez Canillas <javierm@redhat.com> - 2.02-80 * Fri May 03 2019 Javier Martinez Canillas <javierm@redhat.com> - 2.02-80
- Add grub2-emu subpackage - Add grub2-emu subpackage