diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-05-19 12:29:57 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-11 10:06:13 +0100 |
| commit | 6cd66bd9fba499786451c1d95c73e64caad08a44 (patch) | |
| tree | a3e453625fa54cb2956eafecb37eabe220cff416 | |
| parent | 5a316a07e2f40507f6882e1da5f85a5033ad58cd (diff) | |
| download | poky-6cd66bd9fba499786451c1d95c73e64caad08a44.tar.gz | |
systemd: Drop 0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
This patch was effectively needed when usng gold linker but it has been
fixed in binutils [1], it was seen in systemd as well [2]
This however, should not happen with latest binutils and systemd has
already reverted the fix since it was a tool error
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=18548
[2] https://github.com/systemd/systemd/issues/234
(From OE-Core rev: afedd8aad2e4c6759bda6002f6af4c2378d15a03)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e57707e820f548b3ad940ee6de9e45b4de869565)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_250.5.bb | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch deleted file mode 100644 index f4066d7e4f..0000000000 --- a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From d8bf23d7a698bd3253b0cfba24bd8afd0886d82d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
| 3 | Date: Mon, 25 Feb 2019 15:18:00 +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 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | [Rebased for v241] | ||
| 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
| 14 | |||
| 15 | --- | ||
| 16 | src/libsystemd/sd-bus/bus-error.c | 4 ++-- | ||
| 17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c | ||
| 20 | index 61928f4bf3..79b698b092 100644 | ||
| 21 | --- a/src/libsystemd/sd-bus/bus-error.c | ||
| 22 | +++ b/src/libsystemd/sd-bus/bus-error.c | ||
| 23 | @@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { | ||
| 24 | }; | ||
| 25 | |||
| 26 | /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ | ||
| 27 | -extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[]; | ||
| 28 | -extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[]; | ||
| 29 | +extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[] _hidden_; | ||
| 30 | +extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[] _hidden_; | ||
| 31 | |||
| 32 | /* Additional maps registered with sd_bus_error_add_map() are in this | ||
| 33 | * NULL terminated array */ | ||
diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 2f5b9d1367..c121fb763e 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb | |||
| @@ -44,7 +44,6 @@ SRC_URI_MUSL = "\ | |||
| 44 | file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ | 44 | file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ |
| 45 | file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ | 45 | file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ |
| 46 | file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ | 46 | file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ |
| 47 | file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ | ||
| 48 | file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ | 47 | file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ |
| 49 | file://0021-test-json.c-define-M_PIl.patch \ | 48 | file://0021-test-json.c-define-M_PIl.patch \ |
| 50 | file://0022-do-not-disable-buffer-in-writing-files.patch \ | 49 | file://0022-do-not-disable-buffer-in-writing-files.patch \ |
