From 50a9c3a2b390f8989768e949beec99c00ecd464a Mon Sep 17 00:00:00 2001 From: Petr Šabata Date: Aug 30 2017 15:03:41 +0000 Subject: Limit the pattern matching in do_alt_efi_install to files This unbreaks module builds that contain the ".module" string in their dist tags. Signed-off-by: Petr Šabata --- diff --git a/grub.macros b/grub.macros index a5be995..fb1c96e 100644 --- a/grub.macros +++ b/grub.macros @@ -376,7 +376,7 @@ find . '(' -iname gdb_grub \\\ -o -iname '*.mod' \\\ ')' \\\ -exec cp {} $RPM_BUILD_ROOT/usr/lib/grub/%{grubaltefiarch}/ \\\; \ -find $RPM_BUILD_ROOT -iname "*.mod*" -exec chmod a-x {} '\;' \ +find $RPM_BUILD_ROOT -type f -iname "*.mod*" -exec chmod a-x {} '\;' \ install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \ install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ cd .. \ diff --git a/grub2.spec b/grub2.spec index 97772b8..f0a6e1b 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -454,6 +454,10 @@ fi %endif %changelog +* Wed Aug 30 2017 Petr Šabata - 2.02-15 +- Limit the pattern matching in do_alt_efi_install to files to + unbreak module builds + * Fri Aug 25 2017 Peter Jones - 2.02-14 - Revert the /usr/lib/.build-id/ change: https://fedoraproject.org/wiki/Changes/ParallelInstallableDebuginfo