ARC glibc port was merged upstream in 2.32 There's no need to refer to github as it has the exact same version and can be retired in future.
Signed-off-by: Vineet Gupta <vgu...@synopsys.com> --- Changes since v1: - dropped artifacts related to github version --- .../glibc.hash | 2 ++ package/glibc/arc-2020.03-release/glibc.hash | 7 ------- package/glibc/glibc.mk | 20 ++++++++++--------- 3 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash delete mode 100644 package/glibc/arc-2020.03-release/glibc.hash diff --git a/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash b/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash new file mode 100644 index 000000000000..7fb36ad2ba7e --- /dev/null +++ b/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash @@ -0,0 +1,2 @@ +# Locally calculated (fetched from Github) +sha256 07f3804abbc6a23315f09568686c0e5bb81d714251cf537d25a36f826cae540b glibc-2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5.tar.gz diff --git a/package/glibc/arc-2020.03-release/glibc.hash b/package/glibc/arc-2020.03-release/glibc.hash deleted file mode 100644 index 07ed06bfb502..000000000000 --- a/package/glibc/arc-2020.03-release/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 e265e7179dfdee0add8c89a6be56ed2a9309174d39e7acd50d146ff948319e29 glibc-arc-2020.03-release.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index f2b5b4caf6ac..29f2f5fd3555 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -4,22 +4,24 @@ # ################################################################################ -ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2020.03-release -GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) -else ifeq ($(BR2_RISCV_32),y) -# RISC-V 32-bit (RV32) requires glibc 2.33 or newer -# Until 2.33 is released, just use master -GLIBC_VERSION = 2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99 -GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION)) -else ifeq ($(BR2_csky),y) +ifeq ($(BR2_csky),y) GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176 GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION)) else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef +ifeq ($(BR2_arc),y) +# ARC support in upstream was merged in 2.32 release +# This can be removed once BR upgrades upto 2.32 or later +GLIBC_VERSION = 2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5 +else ifeq ($(BR2_RISCV_32),y) +# RISC-V 32-bit (RV32) requires glibc 2.33 or newer +# Until 2.33 is released, just use master +GLIBC_VERSION = 2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99 +else GLIBC_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d +endif # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. -- 2.25.1 _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
