diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 2b8f49ea6b..053ae6c990 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 19d874f03dadbccaca8ae88a0e96d38435066badfe6ed606c2ad1e525454dece glibc-2.37-45-gb4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3.tar.gz +sha256 5080b1ca43856cb9ca9d9adce2d09803ba5abf6ea003bc5fe2660e4d4ccdfaea glibc-2.28-211-g29f401e05d85919a5328567733867d9447d7d706.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 319028b058..7ec39e1136 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -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.37-45-gb4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 +GLIBC_VERSION = 2.28-211-g29f401e05d85919a5328567733867d9447d7d706 # 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. diff --git a/package/make/make.hash b/package/make/make.hash index 07d91e7baa..be6deb5074 100644 --- a/package/make/make.hash +++ b/package/make/make.hash @@ -1,6 +1,5 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-02/msg00011.html -md5 c8b13b7477e812d4213a9b88ff0ff1d6 make-4.4.1.tar.lz +md5 d5c40e7bd1e97a7404f5d3be982f479a make-4.3.tar.lz # Locally calculated after checking signature -sha256 8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9 make-4.4.1.tar.lz +sha256 de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82 make-4.3.tar.lz # Locally computed sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/make/make.mk b/package/make/make.mk index e194e15873..5880bf8a11 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAKE_VERSION = 4.4.1 +MAKE_VERSION = 4.3 MAKE_SOURCE = make-$(MAKE_VERSION).tar.lz MAKE_SITE = $(BR2_GNU_MIRROR)/make MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf @@ -21,6 +21,7 @@ endif HOST_MAKE_DEPENDENCIES = host-pkgconf HOST_MAKE_CONF_OPTS = --without-guile +HOST_MAKE_CONF_OPTS += make_cv_sys_gnu_glob=yes # Configure host-make binary to be 'host-make' to ensure it isn't # accidently used by packages when they invoke recursive / sub-make. diff --git a/package/util-linux/0001-libmount-ifdef-statx-call.patch b/package/util-linux/0001-libmount-ifdef-statx-call.patch deleted file mode 100644 index ba44650bd3..0000000000 --- a/package/util-linux/0001-libmount-ifdef-statx-call.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c0136ac0c98b18208508fbcfac31a843e0bb8a37 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 3 Aug 2023 12:39:19 +0200 -Subject: [PATCH] libmount: ifdef statx() call - -In this case the statx() is use to get mount ID. It's optional and not -required. Let's #ifdef the statx() call and also check for stx_mnt_id -struct member. - -Fixes: https://github.com/util-linux/util-linux/issues/2415 -Signed-off-by: Karel Zak -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/util-linux/util-linux/commit/c0136ac0c98b18208508fbcfac31a843e0bb8a37 ---- - configure.ac | 5 ++++- - libmount/src/hook_mount.c | 2 ++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a3cf330b5..ae721c7ac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -525,7 +525,10 @@ AC_CHECK_MEMBERS([struct termios.c_line],,, - [[#include ]]) - - AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec],,, -- [#include ]) -+ [[#include ]]) -+ -+AC_CHECK_MEMBERS([struct statx.stx_mnt_id],,, -+ [[#include ]]) - - AC_CHECK_DECLS([_NL_TIME_WEEK_1STDAY],[],[],[[#include ]]) - -diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c -index d69a018ec..056338c49 100644 ---- a/libmount/src/hook_mount.c -+++ b/libmount/src/hook_mount.c -@@ -294,6 +294,7 @@ static int hook_create_mount(struct libmnt_context *cxt, - /* cleanup after fail (libmount may only try the FS type) */ - close_sysapi_fds(api); - -+#if defined(HAVE_STRUCT_STATX) && defined(HAVE_STRUCT_STATX_STX_MNT_ID) - if (!rc && cxt->fs) { - struct statx st; - -@@ -306,6 +307,7 @@ static int hook_create_mount(struct libmnt_context *cxt, - fs->id = cxt->fs->id; - } - } -+#endif - - done: - DBG(HOOK, ul_debugobj(hs, "create FS done [rc=%d, id=%d]", rc, cxt->fs ? cxt->fs->id : -1)); --- -2.39.2 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 7ecd165459..29a0c468aa 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b util-linux-2.39.1.tar.xz +sha256 8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76 util-linux-2.37.1.tar.xz # License files, locally calculated sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 7065155ca2..6920a0321c 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -7,7 +7,7 @@ # When making changes to this file, please check if # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. -UTIL_LINUX_VERSION_MAJOR = 2.39 +UTIL_LINUX_VERSION_MAJOR = 2.37 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) diff --git a/support/dependencies/check-host-make.mk b/support/dependencies/check-host-make.mk index 66560ee85c..042ebdb101 100644 --- a/support/dependencies/check-host-make.mk +++ b/support/dependencies/check-host-make.mk @@ -6,16 +6,11 @@ # package is bumped or a new one added, and it requires a higher # version, our package infra will catch it and whine. # -BR2_MAKE_VERSION_MIN = 4.0 -BR2_MAKE ?= $(call suitable-host-package,make,\ - $(BR2_MAKE_VERSION_MIN) $(MAKE)) +# Godot hack, we must have make 4.3 to build older glibc +# So instead of checking for any particular make version we just +# force the use of our host-built make instead -ifeq ($(BR2_MAKE),) BR2_MAKE = $(HOST_DIR)/bin/host-make -j$(PARALLEL_JOBS) BR2_MAKE1 = $(HOST_DIR)/bin/host-make -j1 BR2_MAKE_HOST_DEPENDENCY = host-make -else -BR2_MAKE = $(MAKE) -BR2_MAKE1 = $(MAKE1) -endif