d3d8639028
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I4bcf73175e81083a575d35d4b1448b29b11beaf7 Signed-off-by: slin14 <shuicheng.lin@intel.com>
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From 432caafd03704396941acec4ff059390ad749719 Mon Sep 17 00:00:00 2001
|
|
From: root <root@yow-cgts4-lx.wrs.com>
|
|
Date: Mon, 22 Jan 2018 16:05:57 -0500
|
|
Subject: macros
|
|
|
|
---
|
|
SOURCES/grub.macros | 10 +---------
|
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 10f74df..075727c 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -81,15 +81,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
|
|
@@ -381,6 +372,7 @@ cd grub-%{1}-%{tarversion} \
|
|
install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ \
|
|
install -m 755 -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.7.4
|
|
|