integ/grub/grub2/centos/meta_patches/0004-grub2-remove-32b-requirements.patch
Zhe Hu b5306a34ee rebase grub2 patch to CentOS 7.6 version
Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/627434

Story: 2004522
Task: 28417

Change-Id: Ibd2c0866dc5d7f4475e3da6ad5aeedc284ed5829
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
2018-12-27 12:23:40 +08:00

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
@@ -49,11 +49,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