package/{glibc, localedef}: bump to version glibc-2.36.9000-50-gf465b21b06a17e26c1af7d75603afc481ebce0f6
PATCH 1/1 package/{glibc, localedef}: bump to version glibc-2.36.9000-50-gf465b21b06a17e26c1af7d75603afc481ebce0f6
patch 0002: already applied upstream
Signed-off-by Michael Fischer <[email protected]>
--- ...ot-posix-conformant-on-microblaze-wi.patch | 37 ------------------- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- package/localedef/localedef.mk | 2 +- 4 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 package/glibc/0002-struct-stat-is-not-posix-conformant-on-microblaze-wi.patch
package/glibc/0002-struct-stat-is-not-posix-conformant-on-microblaze-wi.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 87d415cc133ff493ccd02464c061cb171d11ef2f Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> -Date: Mon, 25 Jul 2022 11:25:15 +0200 -Subject: [PATCH] struct stat is not posix conformant on microblaze with - __USE_FILE_OFFSET64 - -Commit a06b40cdf5ba0d2ab4f9b4c77d21e45ff284fac7 updated stat.h to use -__USE_XOPEN2K8 instead of __USE_MISC to add the st_atim, st_mtim and -st_ctim members to struct stat. However, for microblaze, there are two -definitions of struct stat, depending on the __USE_FILE_OFFSET64 macro. -The second one was not updated. - -Change __USE_MISC to __USE_XOPEN2K8 in the __USE_FILE_OFFSET64 version -of struct stat for microblaze. - -Upstream: https://sourceware.org/bugzilla/show_bug.cgi?id=29403 -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> ---- - sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h b/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h -index a2787e88343..850697f4fa6 100644 ---- a/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h -+++ b/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h -@@ -89,7 +89,7 @@ struct stat - __blksize_t st_blksize; /* Optimal block size for I/O. */ - int __pad3; - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --# ifdef __USE_MISC -+# ifdef __USE_XOPEN2K8 - /* Nanosecond resolution timestamps are stored in a format - * equivalent to 'struct timespec'. This is the type used - * whenever possible but the Unix namespace rules do not allow the --- -2.35.3 -
package/glibc/glibc.hash +1 -1
@@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 f339586a104a8e12ff44d38fb24574d2abe694ddba322404f8bc1a50f4343228 glibc-2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4.tar.gz +sha256 a35b117825e1429dc31de042463630eec8ae204db1c688689160250ea00fea71 glibc-2.36.9000-50-gf465b21b06a17e26c1af7d75603afc481ebce0f6.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/glibc/glibc.mk +1 -1
@@ -7,7 +7,7 @@ # 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 -GLIBC_VERSION = 2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4 +GLIBC_VERSION = 2.36.9000-50-gf465b21b06a17e26c1af7d75603afc481ebce0f6 # 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.
package/localedef/localedef.mk +1 -1
@@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # 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.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4 +LOCALEDEF_VERSION = 2.36.9000-50-gf465b21b06a17e26c1af7d75603afc481ebce0f6 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc
Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Michael,
package/glibc/glibc.mk line 10
Quoted 5 lines · On Thu, 18 Aug 2022 12:28:29 +0200 Michael Fischer <[email protected]> wrote:
# 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 localedefpackage/glibc/glibc.mk +1
-1-GLIBC_VERSION = 2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4 +GLIBC_VERSION = 2.36.9000-50-gf465b21b06a17e26c1af7d75603afc481ebce0f6
Thanks for the patch, however could you generate the GLIBC_VERSION value as explained in the comment just above?
It should give you this:
$ git describe --match 'glibc-*' --abbrev=40 origin/release/2.36/master | cut -d '-' -f 2- 2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3
Could you update with this modification, and send a revised version of your patch?
Thanks a lot!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/1 package/{glibc, localedef}: bump to version glibc-2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3
patch 0002: already applied upstream
Signed-off-by Michael Fischer <[email protected]>
--- ...ot-posix-conformant-on-microblaze-wi.patch | 37 ------------------- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- package/localedef/localedef.mk | 2 +- 4 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 package/glibc/0002-struct-stat-is-not-posix-conformant-on-microblaze-wi.patch
package/glibc/0002-struct-stat-is-not-posix-conformant-on-microblaze-wi.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 87d415cc133ff493ccd02464c061cb171d11ef2f Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> -Date: Mon, 25 Jul 2022 11:25:15 +0200 -Subject: [PATCH] struct stat is not posix conformant on microblaze with - __USE_FILE_OFFSET64 - -Commit a06b40cdf5ba0d2ab4f9b4c77d21e45ff284fac7 updated stat.h to use -__USE_XOPEN2K8 instead of __USE_MISC to add the st_atim, st_mtim and -st_ctim members to struct stat. However, for microblaze, there are two -definitions of struct stat, depending on the __USE_FILE_OFFSET64 macro. -The second one was not updated. - -Change __USE_MISC to __USE_XOPEN2K8 in the __USE_FILE_OFFSET64 version -of struct stat for microblaze. - -Upstream: https://sourceware.org/bugzilla/show_bug.cgi?id=29403 -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> ---- - sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h b/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h -index a2787e88343..850697f4fa6 100644 ---- a/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h -+++ b/sysdeps/unix/sysv/linux/microblaze/bits/struct_stat.h -@@ -89,7 +89,7 @@ struct stat - __blksize_t st_blksize; /* Optimal block size for I/O. */ - int __pad3; - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --# ifdef __USE_MISC -+# ifdef __USE_XOPEN2K8 - /* Nanosecond resolution timestamps are stored in a format - * equivalent to 'struct timespec'. This is the type used - * whenever possible but the Unix namespace rules do not allow the --- -2.35.3 -
package/glibc/glibc.hash +1 -1
@@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 f339586a104a8e12ff44d38fb24574d2abe694ddba322404f8bc1a50f4343228 glibc-2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4.tar.gz +sha256 596bee874d76bc6c5f62af142c9dd40bcb3625ea26975bbc52e552d40e864e54 glibc-2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/glibc/glibc.mk +1 -1
@@ -7,7 +7,7 @@ # 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 -GLIBC_VERSION = 2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4 +GLIBC_VERSION = 2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3 # 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.
package/localedef/localedef.mk +1 -1
@@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # 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.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4 +LOCALEDEF_VERSION = 2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc
Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 1/1] package/{glibc, localedef}: bump to version glibc-2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3
Quoted 10 lines · On Thu, 22 Sep 2022 14:40:10 +0200 Michael Fischer <[email protected]> wrote:
patch 0002: already applied upstream
Signed-off-by Michael Fischer <[email protected]>--- ...ot-posix-conformant-on-microblaze-wi.patch | 37 ------------------- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- package/localedef/localedef.mk | 2 +- 4 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 package/glibc/0002-struct-stat-is-not-posix-conformant-on-microblaze-wi.patch
Applied to master, thanks. Let's see what the autobuilders have to say about this!
Best regards,
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 1/1] package/{glibc, localedef}: bump to version glibc-2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3
Hello Michael,
Quoted 2 lines · On Fri, 23 Sep 2022 23:46:16 +0200 Thomas Petazzoni…
Applied to master, thanks. Let's see what the autobuilders have to say about this!
Turns out the autobuilders are not very happy: this new version of glibc fails to build on a good number of CPU architectures/configurations:
http://autobuild.buildroot.net/?reason=glibc-2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3
Could you have a look?
Thanks a lot!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 1/1] package/{glibc, localedef}: bump to version glibc-2.36-44-g2628500f5dff1dd99c49a09b418b3b1ea3a6b5d3
In reply to Thomas PetazzoniQuoted 2 lines · On Fri, 23 Sep 2022 23:46:16 +0200 Thomas Petazzoni…
Applied to master, thanks. Let's see what the autobuilders have to say about this!
Another issue is the <linux/mount.h> and <sys/mount.h> header conflict. According to
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
it is fixed in the glibc 2.36 branch, and we are currently using the latest commit in this branch. And I indeed see the commits related to that.
But still, it breaks many packages. For example:
http://autobuild.buildroot.net/results/545/5456d9b97dc21ab57666579f62e0ecf910f2cc9c/build-end.log
http://autobuild.buildroot.net/results/9a9/9a9a6743397060b16acbb2fc07dd82aca7f50532/build-end.log
http://autobuild.buildroot.net/results/950/95037ab0580768687aeb5f1e1b5128ddb1d06c91/build-end.log
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot