diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index a7f1daacf9..e999129ccc 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ -# Locally calculated (fetched from Github) -sha256 7ed7900a90fd1b05fd49a25b1877515c6c3f1ab9ea9248af9d5d0e7fdb3fdd82 glibc-2.41-123-gfb4db64a04ad6c96cd1fbb7e02eb59323b1f2ac2.tar.gz +# Locally calculated (fetched from git) +sha256 3789146d175834dc4873f41bd87932cd6ad7c83d0b7bf340768ee6a927aac784 glibc-2.41-123-gfb4db64a04ad6c96cd1fbb7e02eb59323b1f2ac2-git4.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d8e178edad..7c07dd5923 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -8,14 +8,8 @@ # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef GLIBC_VERSION = 2.41-123-gfb4db64a04ad6c96cd1fbb7e02eb59323b1f2ac2 - -# 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. -# When updating the version, check it on the official repository; -# *NEVER* decide on a version string by looking at the mirror. -# Then check that the mirror has been synced already (happens once a day.) -GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION)) +GLIBC_SITE = https://sourceware.org/git/glibc.git +GLIBC_SITE_METHOD = git GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 925998a5f4..441145c38f 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -8,8 +8,9 @@ # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- LOCALEDEF_VERSION = 2.41-123-gfb4db64a04ad6c96cd1fbb7e02eb59323b1f2ac2 -LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz -LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) +LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION)$(BR_FMT_VERSION_git).tar.gz +LOCALEDEF_SITE = https://sourceware.org/git/glibc.git +LOCALEDEF_SITE_METHOD = git HOST_LOCALEDEF_DL_SUBDIR = glibc HOST_LOCALEDEF_DEPENDENCIES = \