Rebase existing patches Brings in following changes
* 46d1c780 fix strings.h feature test macro usage due to missing features.h * baaf257f fix ESRCH error handling for clock_getcpuclockid * 4f48da00 aarch64: add vfork * 7d568410 fix mishandling of errno in getaddrinfo AI_ADDRCONFIG logic * d16d7b10 early stage ldso: remove symbolic references via error handling function * 63c67053 in early stage ldso before __dls2b, call mprotect with __syscall * a23a3da2 avoid limited space of random temp file names if clock resolution is low * 41002798 remove random filename obfuscation that leaks ASLR information * 6c858d6f ensure distinct query id for parallel A and AAAA queries in resolver * 8974ef21 mntent: fix potential mishandling of extremely long lines * 751bee0e mntent: fix parsing lines with optional fields * dcb31f6b fix constraint violation in qsort wrapper around qsort_r Signed-off-by: Khem Raj <[email protected]> --- v2: Rebase and forward patches ...ic-linker-a-relative-symlink-to-libc.patch | 18 +++++++++++------ ...ir-and-libdir-as-default-pathes-to-l.patch | 20 +++++++++++++------ meta/recipes-core/musl/musl_git.bb | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch b/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch index ba00efe7b37..8b097f32768 100644 --- a/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch +++ b/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch @@ -1,7 +1,7 @@ -From 0ec74744a4cba7c5fdfaa2685995119a4fca0260 Mon Sep 17 00:00:00 2001 +From f95b6fd0475a95c00e886219271cb5c93838e3c3 Mon Sep 17 00:00:00 2001 From: Amarnath Valluri <[email protected]> Date: Wed, 18 Jan 2017 16:14:37 +0200 -Subject: [PATCH] Make dynamic linker a relative symlink to libc +Subject: [PATCH 1/2] Make dynamic linker a relative symlink to libc absolute symlink into $(libdir) fails to load in a cross build environment, especially when executing qemu in usermode to run target @@ -13,18 +13,19 @@ V2: Make use of 'ln -r' to create relative symlinks, as most fo the distros shipping coreutils 8.16+ +Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Amarnath Valluri <[email protected]> ---- -Upstream-Status: Pending --- Makefile | 2 +- tools/install.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) +diff --git a/Makefile b/Makefile +index e8cc4436..466d9afd 100644 --- a/Makefile +++ b/Makefile -@@ -210,7 +210,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/inc +@@ -210,7 +210,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/include/% $(INSTALL) -D -m 644 $< $@ $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so @@ -33,6 +34,8 @@ Upstream-Status: Pending install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),) +diff --git a/tools/install.sh b/tools/install.sh +index d913b60b..b6a7f797 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -6,18 +6,20 @@ @@ -58,7 +61,7 @@ Upstream-Status: Pending m) mode=$OPTARG ;; ?) usage ;; esac -@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM H +@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP umask 077 if test "$symlink" ; then @@ -67,3 +70,6 @@ Upstream-Status: Pending else cat < "$1" > "$tmp" chmod "$mode" "$tmp" +-- +2.37.2 + diff --git a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch index 0aeb5eb5c23..59bfae5a27c 100644 --- a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch +++ b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch @@ -1,7 +1,8 @@ -From 5a2886f81dbca3f2ed28eebe7d27d471da278db8 Mon Sep 17 00:00:00 2001 +From 3cce8716c6c3ae2e0c835caeac3780ec35090b2d Mon Sep 17 00:00:00 2001 From: Serhey Popovych <[email protected]> Date: Tue, 11 Dec 2018 05:44:20 -0500 -Subject: [PATCH] ldso: Use syslibdir and libdir as default pathes to libdirs +Subject: [PATCH 2/2] ldso: Use syslibdir and libdir as default pathes to + libdirs In absence of /etc/ld-musl-$(ARCH).path ldso uses default path to search libraries /lib:/usr/local/lib:/usr/lib. @@ -20,6 +21,8 @@ Signed-off-by: Serhey Popovych <[email protected]> ldso/dynlink.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) +diff --git a/Makefile b/Makefile +index 466d9afd..d2f458fa 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe @@ -32,6 +35,8 @@ Signed-off-by: Serhey Popovych <[email protected]> CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS) LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) +diff --git a/ldso/dynlink.c b/ldso/dynlink.c +index cc677952..b0e8815b 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c @@ -29,6 +29,8 @@ @@ -40,10 +45,10 @@ Signed-off-by: Serhey Popovych <[email protected]> +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR + - static void error(const char *, ...); - - #define MAXP2(a,b) (-(-(a)&-(b))) -@@ -1094,7 +1096,7 @@ static struct dso *load_library(const ch + static void error_impl(const char *, ...); + static void error_noop(const char *, ...); + static void (*error)(const char *, ...) = error_noop; +@@ -1097,7 +1099,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) sys_path = ""; } } @@ -52,3 +57,6 @@ Signed-off-by: Serhey Popovych <[email protected]> fd = path_open(name, sys_path, buf, sizeof buf); } pathname = buf; +-- +2.37.2 + diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index fde5fc0ccec..510dd4eeeea 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "6e9d2370c7559af80b32a91f20898f41597e093b" +SRCREV = "46d1c7801bb509e1097e8fadbaf359367fa4ef0b" BASEVER = "1.2.3" -- 2.37.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169318): https://lists.openembedded.org/g/openembedded-core/message/169318 Mute This Topic: https://lists.openembedded.org/mt/93011472/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
