Skip to contentSkip to conversation

package/{glibc, localedef}: move to sourceware.org git repo

PATCH Applied Peter Korsgaard 2 participants 4 messages Feb 4 – Feb 13

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/{glibc, localedef}: move to sourceware.org git repo

As described in https://gitlab.com/buildroot.org/buildroot/-/issues/160, the github mirror is getting shut down - So move to the sourceware.org git repo.

The github mirror was originally used because of performance and reliability issues with sourceware, but that seems be resolved now after server/RAM upgrades - E.G. from the sourceware news:

April 22, 2024
server2.sourceware.org now has 512GB RAM, thanks Red Hat.

https://sourceware.org/

So change back to fetch glibc (and localedef) from sourceware.org over git.

Notice: The git archiving leads to slightly different paths and permissions in the tarball, but the file content is identical:

mkdir a && tar -C a -x --strip-components -f \
	path/to/glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125.tar.gz
mkdir b && tar -C b -x --strip-components -f \
	path/to/glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125-git4.tar.gz

diff -urpN {a,b}; echo $?
0

---
 package/glibc/glibc.hash       |  4 ++--
 package/glibc/glibc.mk         | 10 ++--------
 package/localedef/localedef.mk |  5 +++--
 3 files changed, 7 insertions(+), 12 deletions(-)
package/glibc/glibc.hash +2 -2
index a58bb7b9a7..0a11cfdb5e 100644
@@ -1,5 +1,5 @@
-# Locally calculated (fetched from Github)
-sha256  f63ffa06cd17ee8ff891f6de41de6e189b96edc6b2be2807ae597291f4464388  glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125.tar.gz
+# Locally calculated (fetched from git)
+sha256  737e3b2bfee2e3e209e514133f4ff7d2bef0d0dc903fd46b4e2244f6c998f7b2  glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125-git4.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/glibc/glibc.mk +2 -8
index 44bf9c4b06..80d21b86ed 100644
@@ -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.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125
-
-# 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
package/localedef/localedef.mk +3 -2
index 254a79026a..4da110417a 100644
@@ -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.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125
-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 = \
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

As described in https://gitlab.com/buildroot.org/buildroot/-/issues/160, the github mirror is getting shut down - So move to the sourceware.org git repo.

The github mirror was originally used because of performance and reliability issues with sourceware, but that seems be resolved now after server/RAM upgrades - E.G. from the sourceware news:

April 22, 2024
server2.sourceware.org now has 512GB RAM, thanks Red Hat.

Quoted 8 lines

https://sourceware.org/

So change back to fetch glibc (and localedef) from sourceware.org over git.

Notice: The git archiving leads to slightly different paths and permissions in the tarball, but the file content is identical:

mkdir a && tar -C a -x --strip-components -f \

This should naturally be --strip-components=1 (both lines). Maybe something that can be fixed when applying.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
Quoted 21 lines · Peter Korsgaard
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

As described in

https://gitlab.com/buildroot.org/buildroot/-/issues/160, the

Quoted 1 line

github mirror is getting shut down - So move to the sourceware.org

git repo.

Quoted 1 line

The github mirror was originally used because of performance and

reliability

Quoted 1 line

issues with sourceware, but that seems be resolved now after

server/RAM

Quoted 8 lines

upgrades - E.G. from the sourceware news:

April 22, 2024
server2.sourceware.org now has 512GB RAM, thanks Red Hat.

https://sourceware.org/

So change back to fetch glibc (and localedef) from sourceware.org

over git.

Quoted 8 lines
Quoted 1 line

Notice: The git archiving leads to slightly different paths and

permissions

Quoted 3 lines

in the tarball, but the file content is identical:

mkdir a && tar -C a -x --strip-components -f \

This should naturally be --strip-components=1 (both lines). Maybe something that can be fixed when applying.

Applied to master, after fixing those command lines in the commit log. Thanks.

Quoted 2 lines

--
Bye, Peter Korsgaard

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
In reply to Peter Korsgaard

In reply of:

Quoted 14 lines

As described in https://gitlab.com/buildroot.org/buildroot/-/issues/160, the github mirror is getting shut down - So move to the sourceware.org git repo.

The github mirror was originally used because of performance and reliability issues with sourceware, but that seems be resolved now after server/RAM upgrades - E.G. from the sourceware news:

April 22, 2024
server2.sourceware.org now has 512GB RAM, thanks Red Hat.

https://sourceware.org/

So change back to fetch glibc (and localedef) from sourceware.org over git.

Quoted 7 lines

Notice: The git archiving leads to slightly different paths and permissions in the tarball, but the file content is identical:

mkdir a && tar -C a -x --strip-components -f \
	path/to/glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125.tar.gz
mkdir b && tar -C b -x --strip-components -f \
	path/to/glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125-git4.tar.gz

Applied to 2025.02.x & 2025.11.x. Thanks

Quoted 66 lines

diff -urpN {a,b}; echo $?
0

---
 package/glibc/glibc.hash       |  4 ++--
 package/glibc/glibc.mk         | 10 ++--------
 package/localedef/localedef.mk |  5 +++--
 3 files changed, 7 insertions(+), 12 deletions(-)
package/glibc/glibc.hash +2 -2
index a58bb7b9a7..0a11cfdb5e 100644
@@ -1,5 +1,5 @@
-# Locally calculated (fetched from Github)
-sha256  f63ffa06cd17ee8ff891f6de41de6e189b96edc6b2be2807ae597291f4464388  glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125.tar.gz
+# Locally calculated (fetched from git)
+sha256  737e3b2bfee2e3e209e514133f4ff7d2bef0d0dc903fd46b4e2244f6c998f7b2  glibc-2.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125-git4.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/glibc/glibc.mk +2 -8
index 44bf9c4b06..80d21b86ed 100644
@@ -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.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125
-
-# 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
package/localedef/localedef.mk +3 -2
index 254a79026a..4da110417a 100644
@@ -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.42-51-gcbf39c26b25801e9bc88499b4fd361ac172d4125
-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 = \
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot