rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Limit the pattern matching in do_alt_efi_install to files

Browse Source 
This unbreaks module builds that contain the ".module" string in their
dist tags.

Signed-off-by: Petr Šabata <contyk@redhat.com>
This commit is contained in:
Petr Šabata 2017-08-30 10:11:43 -04:00
parent 7849a868f2
commit 50a9c3a2b3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub.macros
View File

@ -376,7 +376,7 @@ find . '(' -iname gdb_grub \\\
-o -iname '*.mod' \\\ -o -iname '*.mod' \\\
')' \\\ ')' \\\
-exec cp {} $RPM_BUILD_ROOT/usr/lib/grub/%{grubaltefiarch}/ \\\; \ -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 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \
install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
cd .. \ cd .. \

6
grub2.spec
View File

@ -7,7 +7,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 14%{?dist} Release: 15%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
License: GPLv3+ License: GPLv3+
@ -454,6 +454,10 @@ fi
%endif %endif
%changelog %changelog
* Wed Aug 30 2017 Petr Šabata <contyk@redhat.com> - 2.02-15
- Limit the pattern matching in do_alt_efi_install to files to
unbreak module builds
* Fri Aug 25 2017 Peter Jones <pjones@redhat.com> - 2.02-14 * Fri Aug 25 2017 Peter Jones <pjones@redhat.com> - 2.02-14
- Revert the /usr/lib/.build-id/ change: - Revert the /usr/lib/.build-id/ change:
https://fedoraproject.org/wiki/Changes/ParallelInstallableDebuginfo https://fedoraproject.org/wiki/Changes/ParallelInstallableDebuginfo