summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-07-21 10:06:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:41 +0100
commitae1dbbbfb50812f4a8729ce33f714340355fca44 (patch)
tree1d59780b7ea378a4e31400a830b89cb7b91a8420 /meta/recipes-core
parent1994b4f92dd6faf66d334bd2859ee9ce6a27186e (diff)
downloadpoky-ae1dbbbfb50812f4a8729ce33f714340355fca44.tar.gz
systemd: Explicitly add hidden attribute to __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP
These symbols appear in dynsyms of libsystemd.so and musl loader doesnt like it Error relocating /mnt/a/oe/build/tmp/work/i586-bec-linux-musl/avahi/0.7-r0/recipe-sysroot//lib/libsystemd.so.0: __start_BUS_ERROR_MAP: symbol not found Error relocating /mnt/a/oe/build/tmp/work/i586-bec-linux-musl/avahi/0.7-r0/recipe-sysroot//lib/libsystemd.so.0: __stop_BUS_ERROR_MAP: symbol not found [YOCTO #12577] (From OE-Core rev: a13d3314cd4ddc812c3ac2904c8f563f7462878a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch34
-rw-r--r--meta/recipes-core/systemd/systemd_239.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
new file mode 100644
index 0000000000..668f273208
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
@@ -0,0 +1,34 @@
1From 687a5af8dc5d38f918a6ce08fed5297234bf8346 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 2 Mar 2018 18:00:17 -0800
4Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP
5
6for currently unknown reasons they get exported to the shared libries
7even without being listed in the sym file
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11
12Upstream-Status: Pending [ Conditional on master needing this, 239 does need it ]
13
14 src/libsystemd/sd-bus/bus-error.c | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
18index 378f7a377..49d797abd 100644
19--- a/src/libsystemd/sd-bus/bus-error.c
20+++ b/src/libsystemd/sd-bus/bus-error.c
21@@ -71,8 +71,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
22 };
23
24 /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */
25-extern const sd_bus_error_map __start_BUS_ERROR_MAP[];
26-extern const sd_bus_error_map __stop_BUS_ERROR_MAP[];
27+extern const sd_bus_error_map __start_BUS_ERROR_MAP[] _hidden_;
28+extern const sd_bus_error_map __stop_BUS_ERROR_MAP[] _hidden_;
29
30 /* Additional maps registered with sd_bus_error_add_map() are in this
31 * NULL terminated array */
32--
332.16.2
34
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index 7822548993..dc1545abad 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -52,6 +52,7 @@ SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.pa
52 file://0018-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ 52 file://0018-Define-glibc-compatible-basename-for-non-glibc-syste.patch \
53 file://0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ 53 file://0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \
54 file://0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ 54 file://0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \
55 file://0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \
55 " 56 "
56 57
57# Workaround undefined reference to `__stack_chk_fail_local' on qemux86 and qemuppc for musl 58# Workaround undefined reference to `__stack_chk_fail_local' on qemux86 and qemuppc for musl