diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-03-02 18:47:05 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-08 10:39:32 -0800 |
| commit | be2982a630dbbfce6806750efe95720426980c69 (patch) | |
| tree | 08bbd852696d1a67a78eb543f24edc41ae78a812 /meta/recipes-core/systemd | |
| parent | ba9d8c5a39ff1ac4ab083f93d721cda2087c6650 (diff) | |
| download | poky-be2982a630dbbfce6806750efe95720426980c69.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: a54b025bfde774353aa278ca78fa0116c52b6d71)
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/systemd')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_234.bb | 1 |
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 @@ | |||
| 1 | From 687a5af8dc5d38f918a6ce08fed5297234bf8346 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 2 Mar 2018 18:00:17 -0800 | ||
| 4 | Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP | ||
| 5 | |||
| 6 | for currently unknown reasons they get exported to the shared libries | ||
| 7 | even without being listed in the sym file | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | |||
| 12 | Upstream-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 | |||
| 17 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c | ||
| 18 | index 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 | -- | ||
| 33 | 2.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 | " |
| 55 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" | 56 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" |
| 56 | 57 | ||
