[grub2] Make sure gcdaa64.efi is packaged.
Peter Jones
pjones at fedoraproject.org
Thu Nov 20 15:51:19 UTC 2014
commit 497ed2ee414b700455f7bd5f85c819afd3b07e66
Author: Peter Jones <pjones at redhat.com>
Date: Thu Nov 13 12:45:26 2014 -0500
Make sure gcdaa64.efi is packaged.
- Make backtrace and usb conditional on !arm
- Make sure gcdaa64.efi is packaged.
Resolves: rhbz#1163481
Signed-off-by: Peter Jones <pjones at redhat.com>
grub2.spec | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index 92b7246..71194b9 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -47,7 +47,7 @@
Name: grub2
Epoch: 1
Version: 2.02
-Release: 0.11%{?dist}
+Release: 0.12%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
@@ -360,17 +360,18 @@ cd grub-efi-%{tarversion}
--disable-werror
make %{?_smp_mflags}
-GRUB_MODULES=" all_video backtrace boot btrfs cat chain configfile echo \
+GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \
efifwsetup efinet ext2 fat font gfxmenu gfxterm gzio halt \
hfsplus iso9660 jpeg loadenv lvm mdraid09 mdraid1x minicmd \
normal part_apple part_msdos part_gpt password_pbkdf2 png \
reboot search search_fs_uuid search_fs_file search_label \
- serial sleep syslinuxcfg test tftp usb usbserial_common \
- usbserial_pl2303 usbserial_ftdi usbserial_usbdebug video xfs"
+ serial sleep syslinuxcfg test tftp video xfs"
%ifarch aarch64
-GRUB_MODULES="${GRUB_MODULES} linux"
+GRUB_MODULES+=" linux "
%else
-GRUB_MODULES+="${GRUB_MODULES} linuxefi multiboot2 multiboot"
+GRUB_MODULES+=" backtrace usb usbserial_common "
+GRUB_MODULES+=" usbserial_pl2303 usbserial_ftdi usbserial_usbdebug "
+GRUB_MODULES+=" linuxefi multiboot2 multiboot "
%endif
./grub-mkimage -O %{grubefiarch} -o %{grubefiname}.orig -p /EFI/%{efidir} \
-d grub-core ${GRUB_MODULES}
@@ -447,9 +448,7 @@ touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg
ln -s ../boot/efi/EFI/%{efidir}/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg
install -m 755 %{grubefiname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubefiname}
-%ifnarch aarch64
install -m 755 %{grubeficdname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubeficdname}
-%endif
install -D -m 644 unicode.pf2 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/fonts/unicode.pf2
cd ..
%endif
@@ -650,6 +649,11 @@ fi
%{_datarootdir}/grub/themes/
%changelog
+* Thu Nov 13 2014 Peter Jones <pjones at redhat.com> - 2.02-0.12
+- Make backtrace and usb conditional on !arm
+- Make sure gcdaa64.efi is packaged.
+ Resolves: rhbz#1163481
+
* Fri Nov 07 2014 Peter Jones <pjones at redhat.com> - 2.02-0.11
- fix a copy-paste error in patch 0154.
Resolves: rhbz#964828
More information about the scm-commits
mailing list