summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch34
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
new file mode 100644
index 0000000000..2cffc426ed
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-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, 234 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_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index d12e94f463..b15e5a41db 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -51,6 +51,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
51 file://0001-meson-update-header-file-to-detect-memfd_create.patch \ 51 file://0001-meson-update-header-file-to-detect-memfd_create.patch \
52 file://0002-configure.ac-Check-if-memfd_create-is-already-define.patch \ 52 file://0002-configure.ac-Check-if-memfd_create-is-already-define.patch \
53 file://0003-fileio-include-sys-mman.h.patch \ 53 file://0003-fileio-include-sys-mman.h.patch \
54 file://0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \
54 " 55 "
55SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" 56SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
56 57