Skip to contentSkip to conversation

glibc: Upgrade to upcoming 2.32

PATCH In review Khem Raj 2 participants 3 messages Jul 25, 2020 – Jul 26, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 glibc: Upgrade to upcoming 2.32

Drop 0001-localedef-Add-hardlink-resolver-to-build.patch as its applied to localedef upstream

Drop CVE patches which are already part of 2.32 release

Drop unused attribute patch as its fixed differently in 2.32

---
 meta/conf/distro/include/tcmode-default.inc   |   2 +-
 ...2.31.bb => cross-localedef-native_2.32.bb} |  18 +-
 meta/recipes-core/glibc/glibc-common.inc      |   2 +-
 ...bc-locale_2.31.bb => glibc-locale_2.32.bb} |   0
 ...bc-mtrace_2.31.bb => glibc-mtrace_2.32.bb} |   0
 ...-scripts_2.31.bb => glibc-scripts_2.32.bb} |   0
 ...tsuite_2.31.bb => glibc-testsuite_2.32.bb} |   0
 meta/recipes-core/glibc/glibc-version.inc     |   8 +-
 ...dd-hardlink-resolver-from-util-linux.patch |   7 +-
 ...ledef-Add-hardlink-resolver-to-build.patch |  52 -----
 ...-fix-ups-hardlink-to-make-it-compile.patch |   7 +-
 ...Look-for-host-system-ld.so.cache-as-.patch |  14 +-
 ...Fix-buffer-overrun-with-a-relocated-.patch |  12 +-
 ...Raise-the-size-of-arrays-containing-.patch |  28 +--
 ...k-glibc-Allow-64-bit-atomics-for-x86.patch |   7 +-
 ...Make-relocatable-install-for-locales.patch |  60 +++---
 ...5500-e6500-603e-fsqrt-implementation.patch |   7 +-
 ...ndefined-reference-to-__sqrt_finite.patch} |   7 +-
 ...are-now-inline-functions-and-call-o.patch} |   9 +-
 ...43-which-explains-what-the-patch-do.patch} |   8 +-
 ...-err-tab.pl-with-specific-dirs-in-S.patch} |   7 +-
 ...are-now-inline-functions-and-call-o.patch} |   9 +-
 ...gure.ac-handle-correctly-libc_cv_ro.patch} |   7 +-
 ...he-path-sets-wrong-config-variables.patch} |  11 +-
 .../glibc/0016-Add-unused-attribute.patch     |  31 ---
 ...one-re-written-tzselect-as-posix-sh.patch} |   7 +-
 ...ash-dependency-for-nscd-init-script.patch} |   7 +-
 ...s-building-and-testing-instructions.patch} |   7 +-
 ...libc-Help-bootstrap-cross-toolchain.patch} |   9 +-
 ...glibc-Resolve-__fpscr_values-on-SH4.patch} |   7 +-
 ...ort-cross-locale-generation-support.patch} |  17 +-
 ...efine-DUMMY_LOCALE_T-if-not-defined.patch} |   7 +-
 ...archive-uses-a-hard-coded-locale-pa.patch} |   8 +-
 ...e-_dl_build_local_scope-breadth-fir.patch} |   9 +-
 ...t-no-lines-in-bison-generated-files.patch} |   7 +-
 ...026-inject-file-assembly-directives.patch} |  77 +------
 ...ybe-uninitialized-errors-with-Os-BZ.patch} |   7 +-
 ...E_KNOWN_INTERPRETER_NAMES-to-known-.patch} |   8 +-
 ...-the-header-between-arm-and-aarch64.patch} |   7 +-
 ...ate-version-numbers-for-2.32-release.patch |  27 +++
 .../glibc/glibc/CVE-2020-6096.patch           | 112 ----------
 .../glibc/glibc/CVE-2020-6096_2.patch         | 194 ------------------
 .../glibc/{glibc_2.31.bb => glibc_2.32.bb}    |  46 ++---
 43 files changed, 270 insertions(+), 606 deletions(-)
 rename meta/recipes-core/glibc/{cross-localedef-native_2.31.bb => cross-localedef-native_2.32.bb} (70%)
 rename meta/recipes-core/glibc/{glibc-locale_2.31.bb => glibc-locale_2.32.bb} (100%)
 rename meta/recipes-core/glibc/{glibc-mtrace_2.31.bb => glibc-mtrace_2.32.bb} (100%)
 rename meta/recipes-core/glibc/{glibc-scripts_2.31.bb => glibc-scripts_2.32.bb} (100%)
 rename meta/recipes-core/glibc/{glibc-testsuite_2.31.bb => glibc-testsuite_2.32.bb} (100%)
 delete mode 100644 meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-to-build.patch
 rename meta/recipes-core/glibc/glibc/{0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch => 0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch} (97%)
 rename meta/recipes-core/glibc/glibc/{0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch => 0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch} (98%)
 rename meta/recipes-core/glibc/glibc/{0012-Quote-from-bug-1443-which-explains-what-the-patch-do.patch => 0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch} (93%)
 rename meta/recipes-core/glibc/glibc/{0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch => 0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch} (87%)
 rename meta/recipes-core/glibc/glibc/{0014-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch => 0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch} (91%)
 rename meta/recipes-core/glibc/glibc/{0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch => 0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch} (88%)
 rename meta/recipes-core/glibc/glibc/{0017-yes-within-the-path-sets-wrong-config-variables.patch => 0015-yes-within-the-path-sets-wrong-config-variables.patch} (97%)
 delete mode 100644 meta/recipes-core/glibc/glibc/0016-Add-unused-attribute.patch
 rename meta/recipes-core/glibc/glibc/{0018-timezone-re-written-tzselect-as-posix-sh.patch => 0016-timezone-re-written-tzselect-as-posix-sh.patch} (89%)
 rename meta/recipes-core/glibc/glibc/{0019-Remove-bash-dependency-for-nscd-init-script.patch => 0017-Remove-bash-dependency-for-nscd-init-script.patch} (92%)
 rename meta/recipes-core/glibc/glibc/{0020-eglibc-Cross-building-and-testing-instructions.patch => 0018-eglibc-Cross-building-and-testing-instructions.patch} (99%)
 rename meta/recipes-core/glibc/glibc/{0021-eglibc-Help-bootstrap-cross-toolchain.patch => 0019-eglibc-Help-bootstrap-cross-toolchain.patch} (95%)
 rename meta/recipes-core/glibc/glibc/{0022-eglibc-Resolve-__fpscr_values-on-SH4.patch => 0020-eglibc-Resolve-__fpscr_values-on-SH4.patch} (92%)
 rename meta/recipes-core/glibc/glibc/{0023-eglibc-Forward-port-cross-locale-generation-support.patch => 0021-eglibc-Forward-port-cross-locale-generation-support.patch} (98%)
 rename meta/recipes-core/glibc/glibc/{0024-Define-DUMMY_LOCALE_T-if-not-defined.patch => 0022-Define-DUMMY_LOCALE_T-if-not-defined.patch} (84%)
 rename meta/recipes-core/glibc/glibc/{0025-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch => 0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch} (95%)
 rename meta/recipes-core/glibc/glibc/{0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch => 0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch} (88%)
 rename meta/recipes-core/glibc/glibc/{0027-intl-Emit-no-lines-in-bison-generated-files.patch => 0025-intl-Emit-no-lines-in-bison-generated-files.patch} (86%)
 rename meta/recipes-core/glibc/glibc/{0028-inject-file-assembly-directives.patch => 0026-inject-file-assembly-directives.patch} (66%)
 rename meta/recipes-core/glibc/glibc/{0029-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch => 0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch} (92%)
 rename meta/recipes-core/glibc/glibc/{0009-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch => 0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch} (83%)
 rename meta/recipes-core/glibc/glibc/{0030-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch => 0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch} (93%)
 create mode 100644 meta/recipes-core/glibc/glibc/0030-Update-version-numbers-for-2.32-release.patch
 delete mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-6096.patch
 delete mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-6096_2.patch
 rename meta/recipes-core/glibc/{glibc_2.31.bb => glibc_2.32.bb} (69%)
meta/conf/distro/include/tcmode-default.inc +1 -1
index 054985c6a4..84dd6af6cb 100644
@@ -20,7 +20,7 @@ GCCVERSION ?= "10.%"
 SDKGCCVERSION ?= "${GCCVERSION}"
 BINUVERSION ?= "2.34%"
 GDBVERSION ?= "9.%"
-GLIBCVERSION ?= "2.31%"
+GLIBCVERSION ?= "2.32"
 LINUXLIBCVERSION ?= "5.4%"
 QEMUVERSION ?= "5.0%"
 GOVERSION ?= "1.14%"
meta/recipes-core/glibc/cross-localedef-native_2.32.bb renamed from meta/recipes-core/glibc/cross-localedef-native_2.31.bb +8 -10
similarity index 70%
rename from meta/recipes-core/glibc/cross-localedef-native_2.31.bb
rename to meta/recipes-core/glibc/cross-localedef-native_2.32.bb
index 24de55d929..5a0abbb70f 100644
@@ -22,19 +22,17 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
 SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
            \
-           file://0001-localedef-Add-hardlink-resolver-to-build.patch;patchdir=localedef \
-           \
            file://0001-localedef-Add-hardlink-resolver-from-util-linux.patch \
            file://0002-localedef-fix-ups-hardlink-to-make-it-compile.patch \
            \
-           file://0018-timezone-re-written-tzselect-as-posix-sh.patch \
-           file://0019-Remove-bash-dependency-for-nscd-init-script.patch \
-           file://0020-eglibc-Cross-building-and-testing-instructions.patch \
-           file://0021-eglibc-Help-bootstrap-cross-toolchain.patch \
-           file://0022-eglibc-Resolve-__fpscr_values-on-SH4.patch \
-           file://0023-eglibc-Forward-port-cross-locale-generation-support.patch \
-           file://0024-Define-DUMMY_LOCALE_T-if-not-defined.patch \
-           file://0025-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
+           file://0016-timezone-re-written-tzselect-as-posix-sh.patch \
+           file://0017-Remove-bash-dependency-for-nscd-init-script.patch \
+           file://0018-eglibc-Cross-building-and-testing-instructions.patch \
+           file://0019-eglibc-Help-bootstrap-cross-toolchain.patch \
+           file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \
+           file://0021-eglibc-Forward-port-cross-locale-generation-support.patch \
+           file://0022-Define-DUMMY_LOCALE_T-if-not-defined.patch \
+           file://0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
 "
 # Makes for a rather long rev (22 characters), but...
 #
meta/recipes-core/glibc/glibc-common.inc +1 -1
index 8d412cc857..027c700998 100644
@@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm"
 #
 COMPATIBLE_HOST_libc-musl_class-target = "null"
 
-PV = "2.31"
+PV = "2.32"
meta/recipes-core/glibc/glibc-locale_2.32.bb renamed from meta/recipes-core/glibc/glibc-locale_2.31.bb +0 -0
similarity index 100%
rename from meta/recipes-core/glibc/glibc-locale_2.31.bb
rename to meta/recipes-core/glibc/glibc-locale_2.32.bb
meta/recipes-core/glibc/glibc-mtrace_2.32.bb renamed from meta/recipes-core/glibc/glibc-mtrace_2.31.bb +0 -0
similarity index 100%
rename from meta/recipes-core/glibc/glibc-mtrace_2.31.bb
rename to meta/recipes-core/glibc/glibc-mtrace_2.32.bb
meta/recipes-core/glibc/glibc-scripts_2.32.bb renamed from meta/recipes-core/glibc/glibc-scripts_2.31.bb +0 -0
similarity index 100%
rename from meta/recipes-core/glibc/glibc-scripts_2.31.bb
rename to meta/recipes-core/glibc/glibc-scripts_2.32.bb
meta/recipes-core/glibc/glibc-testsuite_2.32.bb renamed from meta/recipes-core/glibc/glibc-testsuite_2.31.bb +0 -0
similarity index 100%
rename from meta/recipes-core/glibc/glibc-testsuite_2.31.bb
rename to meta/recipes-core/glibc/glibc-testsuite_2.32.bb
meta/recipes-core/glibc/glibc-version.inc +4 -4
index c2d68979eb..790b090f4a 100644
@@ -1,7 +1,7 @@
-SRCBRANCH ?= "release/2.31/master"
-PV = "2.31+git${SRCPV}"
-SRCREV_glibc ?= "109474122400ca7d60782b131dc867a5c1f2fe55"
-SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655"
+SRCBRANCH ?= "master"
+PV = "2.32"
+SRCREV_glibc ?= "7ebd114211dcd290efd54e610bbde0765bd7764c"
+SRCREV_localedef ?= "b6ca7c146c6d2c93cddfa61e395cb8a196e3d46f"
 
 GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
 
meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch +5 -2
index d0786be8b8..e0ec1887dc 100644
@@ -1,7 +1,7 @@
-From 3dcf144e998aed17b3fb957a255b1e923ba07d71 Mon Sep 17 00:00:00 2001
+From 5db90855621a81d02f1434d5602cefea8c45de1c Mon Sep 17 00:00:00 2001
 From: Jason Wessel <[email protected]>
 Date: Sat, 7 Dec 2019 09:59:22 -0800
-Subject: [PATCH] localedef: Add hardlink resolver from util-linux
+Subject: [PATCH 01/29] localedef: Add hardlink resolver from util-linux
 
 The hard link resolver that is built into localedef cannot be run in
 parallel.  It will search sibling directories (which are be processed
@@ -1128,3 +1128,6 @@ index 0000000000..0129a85e2e
 +}
 +
 +#endif
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-to-build.patch deleted +0 -52

52 lines not on this page · raw message

meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch +5 -2
index 5222e37d1a..05b76803b4 100644
@@ -1,7 +1,7 @@
-From b52dba15527380cc18635e3696e0ef87efee9a84 Mon Sep 17 00:00:00 2001
+From ab022ce3c1c01fd6c850f541a33efd0cacabe052 Mon Sep 17 00:00:00 2001
 From: Jason Wessel <[email protected]>
 Date: Sat, 7 Dec 2019 10:01:37 -0800
-Subject: [PATCH] localedef: fix-ups hardlink to make it compile
+Subject: [PATCH 02/29] localedef: fix-ups hardlink to make it compile
 
 Upstream-Status: Pending
 Signed-off-by: Jason Wessel <[email protected]>
@@ -236,3 +236,6 @@ index 63615896b0..726e6dd948 100644
  				}
  				continue;
  			}
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch +9 -5
index 4cdc8354b6..743994f2db 100644
@@ -1,7 +1,8 @@
-From 6987ad183770cb56680ccc4f6ea065a04f31ccb6 Mon Sep 17 00:00:00 2001
+From de4322ef6d4dc9fc3ee9b69af1c10edbc64a66a3 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 01:48:24 +0000
-Subject: [PATCH] nativesdk-glibc: Look for host system ld.so.cache as well
+Subject: [PATCH 03/29] nativesdk-glibc: Look for host system ld.so.cache as
+ well
 
 Upstream-Status: Inappropriate [embedded specific]
 
@@ -30,10 +31,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/elf/dl-load.c b/elf/dl-load.c
-index a6b80f9395..3226f2e531 100644
+index e39980fb19..565b039b23 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
-@@ -2073,6 +2073,14 @@ _dl_map_object (struct link_map *loader, const char *name,
+@@ -2160,6 +2160,14 @@ _dl_map_object (struct link_map *loader, const char *name,
              }
          }
  
@@ -48,7 +49,7 @@ index a6b80f9395..3226f2e531 100644
  #ifdef USE_LDCONFIG
        if (fd == -1
  	  && (__glibc_likely ((mode & __RTLD_SECURE) == 0)
-@@ -2131,14 +2139,6 @@ _dl_map_object (struct link_map *loader, const char *name,
+@@ -2218,14 +2226,6 @@ _dl_map_object (struct link_map *loader, const char *name,
  	}
  #endif
  
@@ -63,3 +64,6 @@ index a6b80f9395..3226f2e531 100644
        /* Add another newline when we are tracing the library loading.  */
        if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
  	_dl_debug_printf ("\n");
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch +8 -4
index 62e12897f5..a3b5b7750c 100644
@@ -1,7 +1,8 @@
-From 7806340c2accc2c51e7e861b618c29fb5609a007 Mon Sep 17 00:00:00 2001
+From 258c44e4ecffd830cb89d0016d45b2bac765f559 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 01:50:00 +0000
-Subject: [PATCH] nativesdk-glibc: Fix buffer overrun with a relocated SDK
+Subject: [PATCH 04/29] nativesdk-glibc: Fix buffer overrun with a relocated
+ SDK
 
 When ld-linux-*.so.2 is relocated to a path that is longer than the
 original fixed location, the dynamic loader will crash in open_path
@@ -21,10 +22,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 12 insertions(+)
 
 diff --git a/elf/dl-load.c b/elf/dl-load.c
-index 3226f2e531..7cb8a86fab 100644
+index 565b039b23..e1b3486549 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
-@@ -1773,7 +1773,19 @@ open_path (const char *name, size_t namelen, int mode,
+@@ -1860,7 +1860,19 @@ open_path (const char *name, size_t namelen, int mode,
         given on the command line when rtld is run directly.  */
      return -1;
  
@@ -44,3 +45,6 @@ index 3226f2e531..7cb8a86fab 100644
    do
      {
        struct r_search_path_elem *this_dir = *dirs;
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +16 -12
index 294c2b975e..2073576aac 100644
@@ -1,7 +1,8 @@
-From 1b97befbe693eb93a77b6098f6ae1394a53462f4 Mon Sep 17 00:00:00 2001
+From 19cd858f5f04a6ac584fbd89a2fbc51791263b85 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 01:51:38 +0000
-Subject: [PATCH] nativesdk-glibc: Raise the size of arrays containing dl paths
+Subject: [PATCH 05/29] nativesdk-glibc: Raise the size of arrays containing dl
+ paths
 
 This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings
 and lengths as well as ld.so.cache path in the dynamic loader to specific
@@ -25,7 +26,7 @@ Signed-off-by: Khem Raj <[email protected]>
  7 files changed, 14 insertions(+), 10 deletions(-)
 
 diff --git a/elf/dl-cache.c b/elf/dl-cache.c
-index 3eedd9afcf..efdfe5cae7 100644
+index 93d185e788..e115b18756 100644
 --- a/elf/dl-cache.c
 +++ b/elf/dl-cache.c
 @@ -133,6 +133,10 @@ do									      \
@@ -40,10 +41,10 @@ index 3eedd9afcf..efdfe5cae7 100644
  _dl_cache_libcmp (const char *p1, const char *p2)
  {
 diff --git a/elf/dl-load.c b/elf/dl-load.c
-index 7cb8a86fab..e32d4aa936 100644
+index e1b3486549..5226d0c4fa 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
-@@ -110,8 +110,8 @@ static size_t max_capstrlen attribute_relro;
+@@ -111,8 +111,8 @@ static size_t max_capstrlen attribute_relro;
     gen-trusted-dirs.awk.  */
  #include "trusted-dirs.h"
  
@@ -66,10 +67,10 @@ index 331cc1df48..885b2d9476 100644
 +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp")))
    = RUNTIME_LINKER;
 diff --git a/elf/ldconfig.c b/elf/ldconfig.c
-index 681ed78496..8833ed0a6b 100644
+index 0c090dca15..6bb6e0fe72 100644
 --- a/elf/ldconfig.c
 +++ b/elf/ldconfig.c
-@@ -168,6 +168,9 @@ static struct argp argp =
+@@ -171,6 +171,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc, NULL, more_help, NULL
  };
  
@@ -80,18 +81,18 @@ index 681ed78496..8833ed0a6b 100644
     a platform.  */
  static int
 diff --git a/elf/rtld.c b/elf/rtld.c
-index 553cfbd1b7..39347c2c03 100644
+index 5b882163fa..db407b5d8b 100644
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
-@@ -175,6 +175,7 @@ dso_name_valid_for_suid (const char *p)
+@@ -217,6 +217,7 @@ dso_name_valid_for_suid (const char *p)
      }
    return *p != '\0';
  }
 +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache")));
  
- /* LD_AUDIT variable contents.  Must be processed before the
-    audit_list below.  */
-@@ -1222,13 +1223,13 @@ of this helper program; chances are you did not intend to run this program.\n\
+ static void
+ audit_list_init (struct audit_list *list)
+@@ -1286,13 +1287,13 @@ of this helper program; chances are you did not intend to run this program.\n\
    --list                list all dependencies and how they are resolved\n\
    --verify              verify that given object really is a dynamically linked\n\
  			object we can handle\n\
@@ -135,3 +136,6 @@ index 6b310e9e15..3877311df4 100644
  #ifndef add_system_dir
  # define add_system_dir(dir) add_dir (dir)
  #endif
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch +5 -2
index db8b6c0f1c..372dca727e 100644
@@ -1,7 +1,7 @@
-From a752857cc342ee5136c9a593037b6ee6ff8af8ee Mon Sep 17 00:00:00 2001
+From bd0486cab67c3441210aed48caab67418610a765 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 31 Dec 2015 14:35:35 -0800
-Subject: [PATCH] nativesdk-glibc: Allow 64 bit atomics for x86
+Subject: [PATCH 06/29] nativesdk-glibc: Allow 64 bit atomics for x86
 
 The fix consist of allowing 64bit atomic ops for x86.
 This should be safe for i586 and newer CPUs.
@@ -37,3 +37,6 @@ index bb49648374..aa08d3c0a7 100644
  # define SP_REG				"esp"
  # define SEG_REG			"gs"
  # define BR_CONSTRAINT			"r"
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +32 -28

111 lines not on this page · raw message

meta/recipes-core/glibc/glibc/0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch +5 -2
index 3dac325380..5e3b3e2d7b 100644
@@ -1,7 +1,7 @@
-From 61b6c9737897c5828ef4b40699ee0a74c570034a Mon Sep 17 00:00:00 2001
+From 59b0a78ae706a540dbd8905bc97c875220d6aeb2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:01:50 +0000
-Subject: [PATCH] fsl e500/e5500/e6500/603e fsqrt implementation
+Subject: [PATCH 08/29] fsl e500/e5500/e6500/603e fsqrt implementation
 
 Upstream-Status: Pending
 Signed-off-by: Edmar Wienskoski <[email protected]>
@@ -1579,3 +1579,6 @@ index 0000000000..04ff8cc181
 +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies
 @@ -0,0 +1 @@
 +powerpc/powerpc64/e6500/fpu
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch renamed from meta/recipes-core/glibc/glibc/0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch +5 -2
similarity index 97%
rename from meta/recipes-core/glibc/glibc/0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
rename to meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
index 01446abc43..a94ed207f5 100644
@@ -1,7 +1,7 @@
-From 4483a83074a340a921e319b88d72166f18e0df0b Mon Sep 17 00:00:00 2001
+From 78f67f016ca9e3f7a37af86cf6e400cf17cf1d05 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:15:07 +0000
-Subject: [PATCH] ppc/sqrt: Fix undefined reference to `__sqrt_finite'
+Subject: [PATCH 09/29] ppc/sqrt: Fix undefined reference to `__sqrt_finite'
 
 on ppc fixes the errors like below
 | ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite'
@@ -203,3 +203,6 @@ index 26fa067abf..9d175122a8 100644
    return f_washf (b);
  }
 +strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch renamed from meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +6 -3
similarity index 98%
rename from meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
rename to meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index 451f372650..743bea1433 100644
@@ -1,8 +1,8 @@
-From 347b2e31d010b04c42e78157a028aa1d58fe0f5e Mon Sep 17 00:00:00 2001
+From 670b5d70ab62b42ab02a8e18b8fcee2879b8c4a0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:16:38 +0000
-Subject: [PATCH] __ieee754_sqrt{,f} are now inline functions and call out
- __slow versions
+Subject: [PATCH 10/29] __ieee754_sqrt{,f} are now inline functions and call
+ out __slow versions
 
 Upstream-Status: Pending
 
@@ -382,3 +382,6 @@ index 9d175122a8..10de1f0cc3 100644
 +}
 +
  strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch renamed from meta/recipes-core/glibc/glibc/0012-Quote-from-bug-1443-which-explains-what-the-patch-do.patch +6 -2
similarity index 93%
rename from meta/recipes-core/glibc/glibc/0012-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
rename to meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
index a0b46c0479..a9280b7c34 100644
@@ -1,7 +1,8 @@
-From 8ca8e5cd78cbd37a713e1181f8f6641b57352aa8 Mon Sep 17 00:00:00 2001
+From de7a7c04a92dbc5d35cb37e47c471e12784cc95e Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:20:09 +0000
-Subject: [PATCH] Quote from bug 1443 which explains what the patch does :
+Subject: [PATCH 11/29] Quote from bug 1443 which explains what the patch does
+ :
 
   We build some random program and link it with -lust.  When we run it,
   it dies with a SIGSEGV before reaching main().
@@ -56,3 +57,6 @@ index 90856779b1..a29bb86c56 100644
  	  break;
  
  	case R_ARM_TLS_TPOFF32:
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch renamed from meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch +5 -2
similarity index 87%
rename from meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
rename to meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index 736de8cf04..ab07455ade 100644
@@ -1,7 +1,7 @@
-From 21509735678990760d5ebf9d0c65efa4b52b838d Mon Sep 17 00:00:00 2001
+From c8807899367e64d803585e7dd4b56a1085d5893b Mon Sep 17 00:00:00 2001
 From: Ting Liu <[email protected]>
 Date: Wed, 19 Dec 2012 04:39:57 -0600
-Subject: [PATCH] eglibc: run libm-err-tab.pl with specific dirs in ${S}
+Subject: [PATCH 12/29] eglibc: run libm-err-tab.pl with specific dirs in ${S}
 
 libm-err-tab.pl will parse all the files named "libm-test-ulps"
 in the given dir recursively. To avoid parsing the one in
@@ -31,3 +31,6 @@ index c61e11dcd7..5d859e6f84 100644
  	$(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi
  	touch $@
  
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch renamed from meta/recipes-core/glibc/glibc/0014-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +6 -3
similarity index 91%
rename from meta/recipes-core/glibc/glibc/0014-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
rename to meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index e73b640c16..d875825ff9 100644
@@ -1,8 +1,8 @@
-From e33deb119734ef443ef44c42a00a569f90e1e149 Mon Sep 17 00:00:00 2001
+From 86fea3409b89f9d8884053a519282f2f30d7ea87 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:24:46 +0000
-Subject: [PATCH] __ieee754_sqrt{,f} are now inline functions and call out
- __slow versions
+Subject: [PATCH 13/29] __ieee754_sqrt{,f} are now inline functions and call
+ out __slow versions
 
 Upstream-Status: Pending
 
@@ -56,3 +56,6 @@ index 812653558f..10de1f0cc3 100644
       float b;
  #endif
  {
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch renamed from meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch +5 -2
similarity index 88%
rename from meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
rename to meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
index 0cdd0567df..954534bae2 100644
@@ -1,7 +1,7 @@
-From c50cae36e90c41849301a9a668adf31e81e43a07 Mon Sep 17 00:00:00 2001
+From a3c4f67fb3cb02855073a9cdbcf2881fb53144f0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:27:10 +0000
-Subject: [PATCH] sysdeps/gnu/configure.ac: handle correctly
+Subject: [PATCH 14/29] sysdeps/gnu/configure.ac: handle correctly
  $libc_cv_rootsbindir
 
 Upstream-Status:Pending
@@ -37,3 +37,6 @@ index 634fe4de2a..3db1697f4f 100644
 +  test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
    ;;
  esac
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch renamed from meta/recipes-core/glibc/glibc/0017-yes-within-the-path-sets-wrong-config-variables.patch +7 -4
similarity index 97%
rename from meta/recipes-core/glibc/glibc/0017-yes-within-the-path-sets-wrong-config-variables.patch
rename to meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch
index 49089af41e..04a9bf01c4 100644
@@ -1,7 +1,7 @@
-From c421cd7e885497a99179b982dc4a27e8405f8857 Mon Sep 17 00:00:00 2001
+From 17a602b89cbe53a5a92d0153ccb013a737f028cb Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:31:06 +0000
-Subject: [PATCH] 'yes' within the path sets wrong config variables
+Subject: [PATCH 15/29] 'yes' within the path sets wrong config variables
 
 It seems that the 'AC_EGREP_CPP(yes...' example is quite popular
 but being such a short word to grep it is likely to produce
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <[email protected]>
  12 files changed, 28 insertions(+), 28 deletions(-)
 
 diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure
-index 5bd355a691..3bc5537bc0 100644
+index ac3cf6fd36..32add94df9 100644
 --- a/sysdeps/aarch64/configure
 +++ b/sysdeps/aarch64/configure
 @@ -148,12 +148,12 @@ else
@@ -48,7 +48,7 @@ index 5bd355a691..3bc5537bc0 100644
  else
    libc_cv_aarch64_be=no
 diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
-index 7851dd4dac..6e9238171f 100644
+index 8b042d6d05..3cdd262951 100644
 --- a/sysdeps/aarch64/configure.ac
 +++ b/sysdeps/aarch64/configure.ac
 @@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
@@ -258,3 +258,6 @@ index f9cba6e15d..b21f72f1e4 100644
                         #endif
      ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)])
    if test $libc_cv_ppc64_def_call_elf = no; then
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0016-Add-unused-attribute.patch deleted +0 -31
deleted file mode 100644
index 574e7c3503..0000000000
@@ -1,31 +0,0 @@
-From c323125744020a29f79e50dc4d024b55c482eafc Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 18 Mar 2015 00:28:41 +0000
-Subject: [PATCH] Add unused attribute
-
-Helps in avoiding gcc warning when header is is included in
-a source file which does not use both functions
-
-        * iconv/gconv_charset.h (strip):
-        Add unused attribute.
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
----
- iconv/gconv_charset.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
-index 348acc089b..fa92465d89 100644
---- a/iconv/gconv_charset.h
-+++ b/iconv/gconv_charset.h
-@@ -21,7 +21,7 @@
- #include <locale.h>
- 
- 
--static void
-+static void __attribute__ ((unused))
- strip (char *wp, const char *s)
- {
-   int slash_count = 0;
meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch renamed from meta/recipes-core/glibc/glibc/0018-timezone-re-written-tzselect-as-posix-sh.patch +5 -2
similarity index 89%
rename from meta/recipes-core/glibc/glibc/0018-timezone-re-written-tzselect-as-posix-sh.patch
rename to meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch
index 20b0ee98ea..cd072018e5 100644
@@ -1,7 +1,7 @@
-From 2023d88c355b8af6458c8e39ce38b75c1ca4ea2a Mon Sep 17 00:00:00 2001
+From 4762386b599f5c3287310a69ad3555e0129e0c51 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:33:03 +0000
-Subject: [PATCH] timezone: re-written tzselect as posix sh
+Subject: [PATCH 16/29] timezone: re-written tzselect as posix sh
 
 To avoid the bash dependency.
 
@@ -40,3 +40,6 @@ index 18fce27e24..70745f9d36 100755
  
  # Output one argument as-is to standard output.
  # Safer than 'echo', which can mishandle '\' or leading '-'.
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch renamed from meta/recipes-core/glibc/glibc/0019-Remove-bash-dependency-for-nscd-init-script.patch +5 -2
similarity index 92%
rename from meta/recipes-core/glibc/glibc/0019-Remove-bash-dependency-for-nscd-init-script.patch
rename to meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
index 1c15a51308..57907fe660 100644
@@ -1,7 +1,7 @@
-From 06da20d9f89907e5f2777537244e6589ca3c9703 Mon Sep 17 00:00:00 2001
+From dac46c07736a799fc82be03aa546b2d24c19ad78 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 31 Dec 2015 14:33:02 -0800
-Subject: [PATCH] Remove bash dependency for nscd init script
+Subject: [PATCH 17/29] Remove bash dependency for nscd init script
 
 The nscd init script uses #! /bin/bash but only really uses one bashism
 (translated strings), so remove them and switch the shell to #!/bin/sh.
@@ -70,3 +70,6 @@ index a882da7d8b..b02986ec15 100644
  	RETVAL=1
  	;;
  esac
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch renamed from meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch +5 -2
similarity index 99%
rename from meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch
rename to meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
index eda5565371..58d41ffe04 100644
@@ -1,7 +1,7 @@
-From 5641452a24f76c5dafa3749a542fcac93f77390f Mon Sep 17 00:00:00 2001
+From 0bd1dedf77194151397c53b12e0355c2edb8bccc Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:42:58 +0000
-Subject: [PATCH] eglibc: Cross building and testing instructions
+Subject: [PATCH 18/29] eglibc: Cross building and testing instructions
 
 Ported from eglibc
 Upstream-Status: Pending
@@ -614,3 +614,6 @@ index 0000000000..b67b468466
 +- Some tests require access to libstdc++.so.6 and libgcc_s.so.1; we
 +  simply place copies of these libraries in the top GLIBC build
 +  directory.
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch renamed from meta/recipes-core/glibc/glibc/0021-eglibc-Help-bootstrap-cross-toolchain.patch +6 -3
similarity index 95%
rename from meta/recipes-core/glibc/glibc/0021-eglibc-Help-bootstrap-cross-toolchain.patch
rename to meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch
index 6374ea4086..f633079f34 100644
@@ -1,7 +1,7 @@
-From 6a32d5bf40deee5d12d24c06f3ea9b5479c16802 Mon Sep 17 00:00:00 2001
+From 5591b7653411da26fa2939352e50ea4121b327e6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:49:28 +0000
-Subject: [PATCH] eglibc: Help bootstrap cross toolchain
+Subject: [PATCH 19/29] eglibc: Help bootstrap cross toolchain
 
 Taken from EGLIBC, r1484 + r1525
 
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <[email protected]>
  create mode 100644 include/stubs-bootstrap.h
 
 diff --git a/Makefile b/Makefile
-index 8f0a93aceb..8eba23a868 100644
+index 6dcfe40c25..bc37c32e5a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -79,9 +79,18 @@ subdir-dirs = include
@@ -95,3 +95,6 @@ index 0000000000..1d2b669aff
 +   difficult headers.  The <gnu/stubs.h> header depends, via the
 +   EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but
 +   an empty stubs.h like this will do fine for GCC.  */
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch renamed from meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch +5 -2
similarity index 92%
rename from meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch
rename to meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch
index 2a503c811e..bb21c54721 100644
@@ -1,7 +1,7 @@
-From 25c21857a3fc0eb26831616ba88a696dd31ecba1 Mon Sep 17 00:00:00 2001
+From d3451c186f96c6b2434a4ac9304c01730bf22061 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:55:53 +0000
-Subject: [PATCH] eglibc: Resolve __fpscr_values on SH4
+Subject: [PATCH 20/29] eglibc: Resolve __fpscr_values on SH4
 
 2010-09-29  Nobuhiro Iwamatsu  <[email protected]>
             Andrew Stubbs  <[email protected]>
@@ -51,3 +51,6 @@ index 85ff3f900e..7743b8d57a 100644
 +       .long 0x80000
 +weak_alias (___fpscr_values, __fpscr_values)
 +
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch renamed from meta/recipes-core/glibc/glibc/0023-eglibc-Forward-port-cross-locale-generation-support.patch +10 -7
similarity index 98%
rename from meta/recipes-core/glibc/glibc/0023-eglibc-Forward-port-cross-locale-generation-support.patch
rename to meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch
index 1a90f22db6..7fe5db0c2a 100644
@@ -1,7 +1,7 @@
-From 30008327aadf0c775e644bb387d7c25952ed05b5 Mon Sep 17 00:00:00 2001
+From e4b8abdc2d884d721fd89d67b689546f2f780924 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 01:33:49 +0000
-Subject: [PATCH] eglibc: Forward port cross locale generation support
+Subject: [PATCH 21/29] eglibc: Forward port cross locale generation support
 
 Upstream-Status: Pending
 
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <[email protected]>
  create mode 100644 locale/catnames.c
 
 diff --git a/locale/Makefile b/locale/Makefile
-index c9694e236e..ba7105fad6 100644
+index 49c0c78c7d..ebfcf4f4da 100644
 --- a/locale/Makefile
 +++ b/locale/Makefile
 @@ -26,7 +26,8 @@ headers		= langinfo.h locale.h bits/locale.h \
@@ -34,8 +34,8 @@ index c9694e236e..ba7105fad6 100644
 +		  newlocale duplocale freelocale uselocale \
 +		  catnames
  tests		= tst-C-locale tst-locname tst-duplocale
+ tests-container	= tst-localedef-path-norm
  categories	= ctype messages monetary numeric time paper name \
- 		  address telephone measurement identification collate
 diff --git a/locale/catnames.c b/locale/catnames.c
 new file mode 100644
 index 0000000000..538f3f5edb
@@ -361,7 +361,7 @@ index 7ebd933801..5753750756 100644
    size_t bufmax = 56;
  
 diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
-index dbbb0145c0..097a8b6193 100644
+index b048bd05b9..fed15c42ec 100644
 --- a/locale/programs/localedef.c
 +++ b/locale/programs/localedef.c
 @@ -109,6 +109,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
@@ -381,7 +381,7 @@ index dbbb0145c0..097a8b6193 100644
    { NULL, 0, NULL, 0, NULL }
  };
  
-@@ -242,12 +245,14 @@ main (int argc, char *argv[])
+@@ -243,12 +246,14 @@ main (int argc, char *argv[])
       ctype locale.  (P1003.2 4.35.5.2)  */
    setlocale (LC_CTYPE, "POSIX");
  
@@ -396,7 +396,7 @@ index dbbb0145c0..097a8b6193 100644
  
    /* Process charmap file.  */
    charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1);
-@@ -399,6 +404,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
+@@ -400,6 +405,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
        /* Do not hard link to other locales.  */
        hard_links = false;
        break;
@@ -558,3 +558,6 @@ index 030f1727bd..096d8ed895 100644
  #ifdef NL_CURRENT_INDIRECT
  # define WEAK_POSTLOAD(postload) weak_extern (postload)
  #else
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch renamed from meta/recipes-core/glibc/glibc/0024-Define-DUMMY_LOCALE_T-if-not-defined.patch +5 -2
similarity index 84%
rename from meta/recipes-core/glibc/glibc/0024-Define-DUMMY_LOCALE_T-if-not-defined.patch
rename to meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch
index 15e460eb08..0e93183087 100644
@@ -1,7 +1,7 @@
-From 067f71a381ce6626ef1179be3dd90c4ed2aa52fb Mon Sep 17 00:00:00 2001
+From ad5bc87134871b99e082e2449b8c1ce2f1375ef9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 20 Apr 2016 21:11:00 -0700
-Subject: [PATCH] Define DUMMY_LOCALE_T if not defined
+Subject: [PATCH 22/29] Define DUMMY_LOCALE_T if not defined
 
 This is a hack to fix building the locale bits on an older
 CentOs 5.X machine
@@ -27,3 +27,6 @@ index d76d9f7e8b..92b56d7df3 100644
  /* Use the internal textdomain used for libc messages.  */
  #define PACKAGE _libc_intl_domainname
  #ifndef VERSION
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch renamed from meta/recipes-core/glibc/glibc/0025-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch +6 -2
similarity index 95%
rename from meta/recipes-core/glibc/glibc/0025-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
rename to meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
index 543f65d6ea..7cbf6811a1 100644
@@ -1,7 +1,8 @@
-From 8f4b0bac85d14b184e08848b02de3f30775f05b1 Mon Sep 17 00:00:00 2001
+From c5fd8a3d336b8288f631fb6b6dd85f9d1076f25b Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 3 Aug 2018 09:42:06 -0700
-Subject: [PATCH] localedef --add-to-archive uses a hard-coded locale path
+Subject: [PATCH 23/29] localedef --add-to-archive uses a hard-coded locale
+ path
 
 it doesn't exist in normal use, and there's no way to pass an
 alternative filename.
@@ -78,3 +79,6 @@ index dccaf04e3b..ae0b7fe155 100644
  	    {
  	      if (readonly)
  		{
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch renamed from meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch +6 -3
similarity index 88%
rename from meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
rename to meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
index 5f6ee40f22..02e73594a0 100644
@@ -1,7 +1,7 @@
-From 1dad746ce93928a57b2fe618c74722f710751826 Mon Sep 17 00:00:00 2001
+From dffa52364f8c54c455b2459ebe83f05cb6ffc9fc Mon Sep 17 00:00:00 2001
 From: Mark Hatle <[email protected]>
 Date: Thu, 18 Aug 2016 14:07:58 -0500
-Subject: [PATCH] elf/dl-deps.c: Make _dl_build_local_scope breadth first
+Subject: [PATCH 24/29] elf/dl-deps.c: Make _dl_build_local_scope breadth first
 
 According to the ELF specification:
 
@@ -24,7 +24,7 @@ Signed-off-by: Mark Hatle <[email protected]>
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 5103a8a111..54cd80aaff 100644
+index b5a43232a7..8aa8f37fa3 100644
 --- a/elf/dl-deps.c
 +++ b/elf/dl-deps.c
 @@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map)
@@ -51,3 +51,6 @@ index 5103a8a111..54cd80aaff 100644
    return p - list;
  }
  
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch renamed from meta/recipes-core/glibc/glibc/0027-intl-Emit-no-lines-in-bison-generated-files.patch +5 -2
similarity index 86%
rename from meta/recipes-core/glibc/glibc/0027-intl-Emit-no-lines-in-bison-generated-files.patch
rename to meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch
index 2c317d58aa..700fb28874 100644
@@ -1,7 +1,7 @@
-From 3c8d9eae83ab4f1677afc9b379f97114e8503363 Mon Sep 17 00:00:00 2001
+From bc3380877bd2a1f9368a913fa6a2ca1ee88fd95f Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 3 Aug 2018 09:44:00 -0700
-Subject: [PATCH] intl: Emit no lines in bison generated files
+Subject: [PATCH 25/29] intl: Emit no lines in bison generated files
 
 Improve reproducibility:
 Do not put any #line preprocessor commands in bison generated files.
@@ -29,3 +29,6 @@ index ce3072420f..58457840d9 100644
  
  $(inst_localedir)/locale.alias: locale.alias $(+force)
  	$(do-install)
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0026-inject-file-assembly-directives.patch renamed from meta/recipes-core/glibc/glibc/0028-inject-file-assembly-directives.patch +8 -69

202 lines not on this page · raw message

meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch renamed from meta/recipes-core/glibc/glibc/0029-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch +5 -2
similarity index 92%
rename from meta/recipes-core/glibc/glibc/0029-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
rename to meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
index c8c359f2b8..d2c88d2354 100644
@@ -1,7 +1,7 @@
-From 66963ad83bdd3b075006ddca9dfe357aed181d6a Mon Sep 17 00:00:00 2001
+From 10aef8f0671d814aaf910ababc0225cf6f0a46e8 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 17 Dec 2018 21:36:18 +0000
-Subject: [PATCH] locale: prevent maybe-uninitialized errors with -Os [BZ
+Subject: [PATCH 27/29] locale: prevent maybe-uninitialized errors with -Os [BZ
  #19444]
 
 Fixes following error when building for aarch64 with -Os:
@@ -51,3 +51,6 @@ index e071253f85..2889c395f1 100644
    const unsigned char *cp;
    const unsigned char *usrc;
  
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch renamed from meta/recipes-core/glibc/glibc/0009-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch +6 -2
similarity index 83%
rename from meta/recipes-core/glibc/glibc/0009-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
rename to meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
index 456f91fb8e..25c046f5cd 100644
@@ -1,7 +1,8 @@
-From 13beb1f428ec06778590bf526d6e641f73d5cf62 Mon Sep 17 00:00:00 2001
+From 70731329feb7ba20364aa37aed83d920de97f028 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 18 Mar 2015 00:11:22 +0000
-Subject: [PATCH] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known names
+Subject: [PATCH 28/29] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known
+ names
 
 This bolts in a hook for OE to pass its own version of interpreter
 names into glibc especially for multilib case, where it differs from any
@@ -27,3 +28,6 @@ index 994a4426a1..baabf099b1 100644
  };
  
  static struct known_names known_libs[] =
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch renamed from meta/recipes-core/glibc/glibc/0030-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +5 -2
similarity index 93%
rename from meta/recipes-core/glibc/glibc/0030-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
rename to meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
index cbef2f2830..0ebf8a6183 100644
@@ -1,7 +1,7 @@
-From 9cb0a756b017f5961b70ac781d3eaec6c82513cb Mon Sep 17 00:00:00 2001
+From bf1c4b2f01c5f86bb770fd1711a69ea727e0f56e Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 15 May 2020 17:05:45 -0700
-Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64
+Subject: [PATCH 29/29] wordsize.h: Unify the header between arm and aarch64
 
 This helps OE multilibs to not sythesize this header which causes all
 kind of recursions and other issues since wordsize is fundamental header
@@ -65,3 +65,6 @@ index ee01841773..34fcdef1f1 100644
  #endif
  
  #define __WORDSIZE_TIME64_COMPAT32	0
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/0030-Update-version-numbers-for-2.32-release.patch new file +27 -0
new file mode 100644
index 0000000000..164f66f2f9
@@ -0,0 +1,27 @@
+From 8598f95e146f009023debd8088558a71b15a89b4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 21 Jul 2020 13:59:16 -0700
+Subject: [PATCH 30/30] Update version numbers for 2.32 release
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ include/features.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/features.h b/include/features.h
+index b6ff1e9b7b..f3e62d3362 100644
+--- a/include/features.h
++++ b/include/features.h
+@@ -454,7 +454,7 @@
+ /* Major and minor version number of the GNU C library package.  Use
+    these macros to test for features in specific releases.  */
+ #define	__GLIBC__	2
+-#define	__GLIBC_MINOR__	31
++#define	__GLIBC_MINOR__	32
+ 
+ #define __GLIBC_PREREQ(maj, min) \
+ 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
+-- 
+2.27.0
+
meta/recipes-core/glibc/glibc/CVE-2020-6096.patch deleted +0 -112

112 lines not on this page · raw message

meta/recipes-core/glibc/glibc/CVE-2020-6096_2.patch deleted +0 -194

194 lines not on this page · raw message

meta/recipes-core/glibc/glibc_2.32.bb renamed from meta/recipes-core/glibc/glibc_2.31.bb +22 -24

52 lines not on this page · raw message

Signature · 1 line
2.27.0
#1 lore raw
Quoted 9 lines · Khem Raj

Drop 0001-localedef-Add-hardlink-resolver-to-build.patch as its applied
to localedef upstream

Drop CVE patches which are already part of 2.32 release

Drop unused attribute patch as its fixed differently in 2.32

Doesn't look too bad however both qemuppc and qemuppc-alt builds are hanging building gobject-introspection while running:

qemu-ppc -r 3.2.0 -cpu 7400 -L /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/recipe-sysroot -E LD_LIBRARY_PATH=/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/.libs:.libs:/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/recipe-sysroot//usr/lib:/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/recipe-sysroot//lib /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/tmp-introspectng7y7pc4/GLib-2.0 --introspect-dump=/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/tmp-introspectng7y7pc4/functions.txt,/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/tmp-introspectng7y7pc4/dump.xml

(https://autobuilder.yoctoproject.org/typhoon/#/builders/107/builds/743
and
https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/2199)

Also, qemumips failed with a date issue:

https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/754

not sure if that is related to this patch or not. Its rerunning to get a second opinion:

https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/754

There were also two perl failures but I don't think those are from this patch.

Cheers,

Richard

author
#2 lore raw

Thanks Richard I will see if I can reproduce the ppc issue locally and see what could be the problem

Quoted 42 lines · Richard Purdie
Quoted 9 lines · Khem Raj

Drop 0001-localedef-Add-hardlink-resolver-to-build.patch as its applied
to localedef upstream

Drop CVE patches which are already part of 2.32 release

Drop unused attribute patch as its fixed differently in 2.32

Doesn't look too bad however both qemuppc and qemuppc-alt builds are hanging building gobject-introspection while running:

qemu-ppc -r 3.2.0 -cpu 7400 -L
/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/recipe-sysroot
-E LD_LIBRARY_PATH=/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/.libs:.libs:/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/recipe-sysroot//usr/lib:/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/recipe-sysroot//lib /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/tmp-introspectng7y7pc4/GLib-2.0 --introspect-dump=/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/tmp-introspectng7y7pc4/functions.txt,/home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/ppc7400-poky-linux/gobject-introspection/1.64.1-r0/build/tmp-introspectng7y7pc4/dump.xml

(https://autobuilder.yoctoproject.org/typhoon/#/builders/107/builds/743
and
https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/2199)

Also, qemumips failed with a date issue:

https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/754

not sure if that is related to this patch or not. Its rerunning to get a second opinion:

https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/754

There were also two perl failures but I don't think those are from this patch.

Cheers,

Richard