mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
musl: Upgrade to latest tip of trunk
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 (From OE-Core rev: e76b76f371d3158b70ae9d3a44b6d2ab6ba8db34) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
+12
-6
@@ -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 <amarnath.valluri@intel.com>
|
From: Amarnath Valluri <amarnath.valluri@intel.com>
|
||||||
Date: Wed, 18 Jan 2017 16:14:37 +0200
|
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
|
absolute symlink into $(libdir) fails to load in a cross build
|
||||||
environment, especially when executing qemu in usermode to run target
|
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
|
Make use of 'ln -r' to create relative symlinks, as most fo the distros
|
||||||
shipping coreutils 8.16+
|
shipping coreutils 8.16+
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
|
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
|
||||||
---
|
|
||||||
Upstream-Status: Pending
|
|
||||||
---
|
---
|
||||||
Makefile | 2 +-
|
Makefile | 2 +-
|
||||||
tools/install.sh | 8 +++++---
|
tools/install.sh | 8 +++++---
|
||||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index e8cc4436..466d9afd 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -210,7 +210,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/inc
|
@@ -210,7 +210,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/include/%
|
||||||
$(INSTALL) -D -m 644 $< $@
|
$(INSTALL) -D -m 644 $< $@
|
||||||
|
|
||||||
$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
|
$(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),)
|
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
|
--- a/tools/install.sh
|
||||||
+++ b/tools/install.sh
|
+++ b/tools/install.sh
|
||||||
@@ -6,18 +6,20 @@
|
@@ -6,18 +6,20 @@
|
||||||
@@ -58,7 +61,7 @@ Upstream-Status: Pending
|
|||||||
m) mode=$OPTARG ;;
|
m) mode=$OPTARG ;;
|
||||||
?) usage ;;
|
?) usage ;;
|
||||||
esac
|
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
|
umask 077
|
||||||
|
|
||||||
if test "$symlink" ; then
|
if test "$symlink" ; then
|
||||||
@@ -67,3 +70,6 @@ Upstream-Status: Pending
|
|||||||
else
|
else
|
||||||
cat < "$1" > "$tmp"
|
cat < "$1" > "$tmp"
|
||||||
chmod "$mode" "$tmp"
|
chmod "$mode" "$tmp"
|
||||||
|
--
|
||||||
|
2.37.2
|
||||||
|
|
||||||
|
|||||||
+14
-6
@@ -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 <serhe.popovych@gmail.com>
|
From: Serhey Popovych <serhe.popovych@gmail.com>
|
||||||
Date: Tue, 11 Dec 2018 05:44:20 -0500
|
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
|
In absence of /etc/ld-musl-$(ARCH).path ldso uses default path to search
|
||||||
libraries /lib:/usr/local/lib:/usr/lib.
|
libraries /lib:/usr/local/lib:/usr/lib.
|
||||||
@@ -20,6 +21,8 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
|
|||||||
ldso/dynlink.c | 4 +++-
|
ldso/dynlink.c | 4 +++-
|
||||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 466d9afd..d2f458fa 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe
|
@@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe
|
||||||
@@ -32,6 +35,8 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
|
|||||||
CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS)
|
CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS)
|
||||||
|
|
||||||
LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS)
|
LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS)
|
||||||
|
diff --git a/ldso/dynlink.c b/ldso/dynlink.c
|
||||||
|
index cc677952..b0e8815b 100644
|
||||||
--- a/ldso/dynlink.c
|
--- a/ldso/dynlink.c
|
||||||
+++ b/ldso/dynlink.c
|
+++ b/ldso/dynlink.c
|
||||||
@@ -29,6 +29,8 @@
|
@@ -29,6 +29,8 @@
|
||||||
@@ -40,10 +45,10 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
|
|||||||
|
|
||||||
+#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR
|
+#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR
|
||||||
+
|
+
|
||||||
static void error(const char *, ...);
|
static void error_impl(const char *, ...);
|
||||||
|
static void error_noop(const char *, ...);
|
||||||
#define MAXP2(a,b) (-(-(a)&-(b)))
|
static void (*error)(const char *, ...) = error_noop;
|
||||||
@@ -1094,7 +1096,7 @@ static struct dso *load_library(const ch
|
@@ -1097,7 +1099,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by)
|
||||||
sys_path = "";
|
sys_path = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -52,3 +57,6 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
|
|||||||
fd = path_open(name, sys_path, buf, sizeof buf);
|
fd = path_open(name, sys_path, buf, sizeof buf);
|
||||||
}
|
}
|
||||||
pathname = buf;
|
pathname = buf;
|
||||||
|
--
|
||||||
|
2.37.2
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
require musl.inc
|
require musl.inc
|
||||||
inherit linuxloader
|
inherit linuxloader
|
||||||
|
|
||||||
SRCREV = "6e9d2370c7559af80b32a91f20898f41597e093b"
|
SRCREV = "46d1c7801bb509e1097e8fadbaf359367fa4ef0b"
|
||||||
|
|
||||||
BASEVER = "1.2.3"
|
BASEVER = "1.2.3"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user