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>
17 lines
673 B
Diff
17 lines
673 B
Diff
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
|
|
index 11f6b0e..613f2e1 100644
|
|
--- a/SPECS/grub2.spec
|
|
+++ b/SPECS/grub2.spec
|
|
@@ -37,11 +37,6 @@ BuildRequires: /usr/lib64/crt1.o glibc-static glibc-devel
|
|
BuildRequires: /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64)
|
|
# glibc32 is what will be in the buildroots, but glibc-static(x86-32) is what
|
|
# will be in an epel-7 (i.e. centos) mock root. I think.
|
|
-%if 0%{?centos}%{?mock}
|
|
-BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) glibc-devel(x86-32)
|
|
-%else
|
|
-BuildRequires: /usr/lib/crt1.o glibc32
|
|
-%endif
|
|
%else
|
|
# ppc64 builds need the ppc crt1.o
|
|
BuildRequires: /usr/lib/crt1.o glibc-static glibc-devel
|