From 4f0523f8f8380514d88b22201dd5a66ab85e81ee Mon Sep 17 00:00:00 2001
From: chentt_tt <chen_tingting1@hoperun.com>
Date: Mon, 22 Feb 2021 03:21:34 -0500
Subject: [PATCH] modify the dependent package basesystem to base-files

---
 ...tch => 0001-glibc-add-arm32-support.patch} | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)
 rename patches/glibc/spec/{0001-add-arm32-support.patch => 0001-glibc-add-arm32-support.patch} (67%)

diff --git a/patches/glibc/spec/0001-add-arm32-support.patch b/patches/glibc/spec/0001-glibc-add-arm32-support.patch
similarity index 67%
rename from patches/glibc/spec/0001-add-arm32-support.patch
rename to patches/glibc/spec/0001-glibc-add-arm32-support.patch
index 620f4a8..47a66d6 100644
--- a/patches/glibc/spec/0001-add-arm32-support.patch
+++ b/patches/glibc/spec/0001-glibc-add-arm32-support.patch
@@ -1,14 +1,14 @@
-From 885b4c81557986011fa025a22d9aef7b3e742835 Mon Sep 17 00:00:00 2001
+From 10b8cca9eb1dbb394bd89846748d0954e89bdd6e Mon Sep 17 00:00:00 2001
 From: root <root@localhost.localdomain>
-Date: Tue, 17 Nov 2020 21:11:23 -0500
-Subject: [PATCH] add arm32 support
+Date: Mon, 22 Feb 2021 02:33:16 -0500
+Subject: [PATCH] glibc-add-arm32-support
 
 ---
- glibc.spec | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
+ glibc.spec | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/glibc.spec b/glibc.spec
-index 1dc2725..c9775c3 100644
+index 1dc2725..372ffa6 100644
 --- a/glibc.spec
 +++ b/glibc.spec
 @@ -59,7 +59,7 @@
@@ -16,11 +16,23 @@ index 1dc2725..c9775c3 100644
  Name: 	 	glibc
  Version: 	2.28
 -Release: 	36
-+Release: 	37
++Release: 	38
  Summary: 	The GNU libc libraries
  License:	%{all_license}
  URL: 		http://www.gnu.org/software/glibc/
-@@ -528,7 +528,7 @@ pushd build-%{target}
+@@ -110,7 +110,11 @@ BuildRequires: gcc-c++ libstdc++-static glibc-devel libidn2
+ 
+ Requires: glibc-common = %{version}-%{release}
+ Requires: glibc-langpack = %{version}-%{release}
++%ifarch armv7hl
++Requires(pre): base-files
++%else
+ Requires(pre): basesystem
++%endif
+ 
+ %description
+ The GNU C Library project provides the core libraries for the GNU system and
+@@ -528,7 +532,7 @@ pushd build-%{target}
      -I. -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
      -L../build-%{target} \
      -B../build-%{target}/csu/ -lc -lc_nonshared \
@@ -29,7 +41,7 @@ index 1dc2725..c9775c3 100644
      -Wl,-rpath-link=.:./math:./elf:./dlfcn:./nss:./rt:./resolv:./mathvec:./support:./nptl libc.so.6 libc_nonshared.a \
      -Wl,--as-needed $olddir/build-%{target}/elf/ld.so
  install -m 700 build-locale-archive $RPM_BUILD_ROOT%{_prefix}/sbin/build-locale-archive
-@@ -735,8 +735,8 @@ fi
+@@ -735,8 +739,8 @@ fi
  %verify(not md5 size mtime) %config(noreplace) /etc/nsswitch.conf
  %verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf
  %verify(not md5 size mtime) %config(noreplace) /etc/rpc
@@ -40,7 +52,7 @@ index 1dc2725..c9775c3 100644
  %dir /etc/ld.so.conf.d
  %dir %{_prefix}/libexec/getconf
  %{_prefix}/libexec/getconf/*
-@@ -902,7 +902,7 @@ fi
+@@ -902,7 +906,7 @@ fi
  %{_prefix}/bin/pcprofiledump
  %{_prefix}/bin/xtrace
  %{_prefix}/lib/debug/usr/bin/*.debug
@@ -49,10 +61,13 @@ index 1dc2725..c9775c3 100644
  
  
  %files help
-@@ -918,6 +918,9 @@ fi
+@@ -918,6 +922,12 @@ fi
  
  
  %changelog
++* Mon Feb 22 2021 chentt_tt <chen_tingting1@hopefun.com> -2.28-38
++- modify the dependent package basesystem to base-files
++
 +* Thu Nov 17 2020 js_liangdong<liang_dong@hoperun.com> - 2.28-37
 +- add arm32 compilation support
 +
-- 
Gitee