From cdf5ff2cf8616a1b7a30742eb88f3c4595b8ed2c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 17 Feb 2017 14:00:38 +0100 Subject: glibc: forward port patch to 2.25 While at it remove version from recipe directory. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- .../0001-linux-minimum-version-set-to-3.1.10.patch | 49 ---------------------- recipes-core/glibc-2.24/glibc_2.24.bbappend | 3 -- .../0001-linux-minimum-version-set-to-3.1.10.patch | 49 ++++++++++++++++++++++ recipes-core/glibc/glibc_2.25.bbappend | 3 ++ 4 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 recipes-core/glibc-2.24/glibc-2.24/0001-linux-minimum-version-set-to-3.1.10.patch delete mode 100644 recipes-core/glibc-2.24/glibc_2.24.bbappend create mode 100644 recipes-core/glibc/glibc-2.25/0001-linux-minimum-version-set-to-3.1.10.patch create mode 100644 recipes-core/glibc/glibc_2.25.bbappend (limited to 'recipes-core') diff --git a/recipes-core/glibc-2.24/glibc-2.24/0001-linux-minimum-version-set-to-3.1.10.patch b/recipes-core/glibc-2.24/glibc-2.24/0001-linux-minimum-version-set-to-3.1.10.patch deleted file mode 100644 index 028f0c6..0000000 --- a/recipes-core/glibc-2.24/glibc-2.24/0001-linux-minimum-version-set-to-3.1.10.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 68bc2dbe4ee91ee48bbd398bbbfcae01a9bda7ff Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Mon, 19 Dec 2016 16:57:51 +0100 -Subject: [PATCH] linux minimum version: set to 3.1.10 - -This allows using glibc 2.24 with the older 3.1.10 L4T kernel. - -Set the minimum allowed kernel version to 3.1.10. -The only conditional which got removed from 2.23 to 2.24 is for kernels -> 3.0.0 -__ASSUME_FUTEX_LOCK_PI with commit f5c77f78ec03363d5e550c4996deb75ee3f2e32a -The code mentioned in the commit which makes the conditional unneeded is -also part of the L4T kernel. - -Signed-off-by: Max Krummenacher ---- - sysdeps/unix/sysv/linux/configure | 2 +- - sysdeps/unix/sysv/linux/configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure -index cace758..cacb9e7 100644 ---- a/sysdeps/unix/sysv/linux/configure -+++ b/sysdeps/unix/sysv/linux/configure -@@ -51,7 +51,7 @@ fi - # set arch_minimum_kernel already, let that override our defaults here. - # Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde - # if appropriate too. --test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0 -+test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.1.10 - if test -n "$minimum_kernel"; then - - user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`)) -diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac -index 13abda0..b7df956 100644 ---- a/sysdeps/unix/sysv/linux/configure.ac -+++ b/sysdeps/unix/sysv/linux/configure.ac -@@ -33,7 +33,7 @@ fi - # set arch_minimum_kernel already, let that override our defaults here. - # Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde - # if appropriate too. --test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0 -+test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.1.10 - if test -n "$minimum_kernel"; then - changequote(,) - user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`)) --- -2.5.5 - diff --git a/recipes-core/glibc-2.24/glibc_2.24.bbappend b/recipes-core/glibc-2.24/glibc_2.24.bbappend deleted file mode 100644 index 405ef16..0000000 --- a/recipes-core/glibc-2.24/glibc_2.24.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/glibc-2.24:" -SRC_URI_append = " file://0001-linux-minimum-version-set-to-3.1.10.patch" -OLDEST_KERNEL = "3.1.10" diff --git a/recipes-core/glibc/glibc-2.25/0001-linux-minimum-version-set-to-3.1.10.patch b/recipes-core/glibc/glibc-2.25/0001-linux-minimum-version-set-to-3.1.10.patch new file mode 100644 index 0000000..028f0c6 --- /dev/null +++ b/recipes-core/glibc/glibc-2.25/0001-linux-minimum-version-set-to-3.1.10.patch @@ -0,0 +1,49 @@ +From 68bc2dbe4ee91ee48bbd398bbbfcae01a9bda7ff Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Mon, 19 Dec 2016 16:57:51 +0100 +Subject: [PATCH] linux minimum version: set to 3.1.10 + +This allows using glibc 2.24 with the older 3.1.10 L4T kernel. + +Set the minimum allowed kernel version to 3.1.10. +The only conditional which got removed from 2.23 to 2.24 is for kernels +> 3.0.0 +__ASSUME_FUTEX_LOCK_PI with commit f5c77f78ec03363d5e550c4996deb75ee3f2e32a +The code mentioned in the commit which makes the conditional unneeded is +also part of the L4T kernel. + +Signed-off-by: Max Krummenacher +--- + sysdeps/unix/sysv/linux/configure | 2 +- + sysdeps/unix/sysv/linux/configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure +index cace758..cacb9e7 100644 +--- a/sysdeps/unix/sysv/linux/configure ++++ b/sysdeps/unix/sysv/linux/configure +@@ -51,7 +51,7 @@ fi + # set arch_minimum_kernel already, let that override our defaults here. + # Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde + # if appropriate too. +-test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0 ++test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.1.10 + if test -n "$minimum_kernel"; then + + user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`)) +diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac +index 13abda0..b7df956 100644 +--- a/sysdeps/unix/sysv/linux/configure.ac ++++ b/sysdeps/unix/sysv/linux/configure.ac +@@ -33,7 +33,7 @@ fi + # set arch_minimum_kernel already, let that override our defaults here. + # Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde + # if appropriate too. +-test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0 ++test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.1.10 + if test -n "$minimum_kernel"; then + changequote(,) + user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`)) +-- +2.5.5 + diff --git a/recipes-core/glibc/glibc_2.25.bbappend b/recipes-core/glibc/glibc_2.25.bbappend new file mode 100644 index 0000000..34b6c98 --- /dev/null +++ b/recipes-core/glibc/glibc_2.25.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/glibc-2.25:" +SRC_URI_append = " file://0001-linux-minimum-version-set-to-3.1.10.patch" +OLDEST_KERNEL = "3.1.10" -- cgit v1.2.3