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

Enable 32-bit ARM EFI builds.

Browse Source 
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-06-26 16:01:03 -04:00
parent 31cddd6fc0
commit dd0009ec4d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grub.macros
View File

@ -26,6 +26,7 @@
-e 's/-mregparm=3/-mregparm=4/g' \\\ -e 's/-mregparm=3/-mregparm=4/g' \\\
-e 's/-fexceptions//g' \\\ -e 's/-fexceptions//g' \\\
-e 's/-fasynchronous-unwind-tables//g' \\\ -e 's/-fasynchronous-unwind-tables//g' \\\
-e 's/-mfloat-abi=hard/-mfloat-abi=float/g' \\\
-e 's/^/ -fno-strict-aliasing /' \\\ -e 's/^/ -fno-strict-aliasing /' \\\
%{nil} %{nil}
@ -88,7 +89,7 @@
%global efi_modules " backtrace http linuxefi usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug " %global efi_modules " backtrace http linuxefi usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug "
%endif %endif
%ifarch aarch64 %ifarch aarch64 %{arm}
%global legacy_provides -l %global legacy_provides -l
%endif %endif
@ -301,7 +302,7 @@ git config --unset user.name \
--with-grubdir=%{name} \\\ --with-grubdir=%{name} \\\
--program-transform-name=s,grub,%{name}, \\\ --program-transform-name=s,grub,%{name}, \\\
--disable-grub-mount \\\ --disable-grub-mount \\\
--disable-werror \ --disable-werror || ( cat config.log ; exit 1 ) \
%{nil} %{nil}
%define do_efi_build_modules() \ %define do_efi_build_modules() \
@ -319,7 +320,7 @@ for x in grub-mkimage ; do \\\
done \ done \
%{nil} %{nil}
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64 %{arm}
%define mkimage() \ %define mkimage() \
%{4}./grub-mkimage -O %{1} -o %{2}.orig \\\ %{4}./grub-mkimage -O %{1} -o %{2}.orig \\\
-p /EFI/%{efidir} -d grub-core ${GRUB_MODULES} \ -p /EFI/%{efidir} -d grub-core ${GRUB_MODULES} \
@ -380,7 +381,7 @@ cd grub-%{1}-%{tarversion} \
--with-grubdir=%{name} \\\ --with-grubdir=%{name} \\\
--program-transform-name=s,grub,%{name}, \\\ --program-transform-name=s,grub,%{name}, \\\
--disable-grub-mount \\\ --disable-grub-mount \\\
--disable-werror \ --disable-werror || ( cat config.log ; exit 1 ) \
make %{?_smp_mflags} \ make %{?_smp_mflags} \
cd .. \ cd .. \
%{nil} %{nil}

2
grub2.spec
View File

@ -46,7 +46,7 @@ BuildRequires: pesign >= 0.99-8
BuildRequires: ccache BuildRequires: ccache
%endif %endif
ExcludeArch: s390 s390x %{arm} ExcludeArch: s390 s390x
Obsoletes: %{name} <= %{evr} Obsoletes: %{name} <= %{evr}
%if 0%{with_legacy_arch} %if 0%{with_legacy_arch}