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>
23 lines
714 B
Diff
23 lines
714 B
Diff
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 6e12329..10f74df 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -15,16 +15,7 @@
|
|
%global cc_equals %{nil}
|
|
%endif
|
|
|
|
-%global efi_cflags %(echo %{optflags} | \\\
|
|
- sed \\\
|
|
- -e 's/-O./-g3/g' \\\
|
|
- -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\
|
|
- -e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\
|
|
- -e 's/--param=ssp-buffer-size=4//g' \\\
|
|
- -e 's/-mregparm=3/-mregparm=4/g' \\\
|
|
- -e 's/-fexceptions//g' \\\
|
|
- -e 's/-fasynchronous-unwind-tables//g' \\\
|
|
- -e 's/^/ -fno-strict-aliasing /' ) %{nil}
|
|
+%global efi_cflags ''
|
|
%global legacy_cflags %(echo %{efi_cflags} | \\\
|
|
sed \\\
|
|
-e 's/-m64//g' \\\
|