589e8020db
This commit results in no change to actual code. It cleans up the following issues in the meta patches: - some patches generated fuzz and offset warnings - patch file names do not match that generated by git format-patch - some patches were not in git format, did not have a proper git header - some patches were not signed off by anybody - file names contained grub2 which is redundant - one patch added a blank line to the end of a file generating a warning, and a subsequent patch removed it. This has now been squashed out. There are 13 patches in total, they were numbered 1-14 with 4 being absent. They are now numbered 1-13. Verification: Built and captured the output, verified that there are no more fuzz and offset warnings. Closes-Bug: 1959037 Change-Id: I8056adf3ee96dc036262aa8c2d9eecfc353cc5ba Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 7bcc190f7bbb9503fcb911f595b1f6e7539a0d90 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <7bcc190f7bbb9503fcb911f595b1f6e7539a0d90.1643237526.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
|
|
References: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
|
|
From: root <root@yow-cgts4-lx.wrs.com>
|
|
Date: Mon, 22 Jan 2018 16:05:57 -0500
|
|
Subject: [PATCH 04/13] remove 32 bit build
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
SOURCES/grub.macros | 10 +---------
|
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 487ee27..efe46cc 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -82,15 +82,6 @@
|
|
%global legacy_package_arch pc
|
|
%global platform pc
|
|
|
|
-%global alt_efi_arch ia32
|
|
-%global alt_target_cpu_name i386
|
|
-%global alt_grub_target_name i386-efi
|
|
-%global alt_platform efi
|
|
-%global alt_package_arch efi-ia32
|
|
-%global alt_efi_cflags %(echo %{efi_cflags} | \\\
|
|
- sed \\\
|
|
- -e 's/-m64//g' \\\
|
|
- ) %{nil}
|
|
%endif
|
|
|
|
%ifarch aarch64
|
|
@@ -385,6 +376,7 @@ cd grub-%{1}-%{tarversion} \
|
|
install -m 700 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ \
|
|
install -m 700 -d $RPM_BUILD_ROOT/boot/grub2/ \
|
|
make DESTDIR=$RPM_BUILD_ROOT install \
|
|
+find $RPM_BUILD_ROOT -name "grub2-bios-setup*" | xargs rm -f \
|
|
if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then \
|
|
rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info \
|
|
fi \
|
|
--
|
|
2.29.2
|
|
|