From: Khem Raj <[email protected]> Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Luca Ceresoli <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 433d51c3840d03623509ce8e3a1b3679f8771164) Signed-off-by: Steve Sakoman <[email protected]> --- ...missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | 3 +++ .../systemd/0008-add-missing-FTW_-macros-for-musl.patch | 3 +++ ...fix-missing-of-__register_atfork-for-non-glibc-build.patch | 3 +++ .../systemd/systemd/0021-test-json.c-define-M_PIl.patch | 4 ++++ 4 files changed, 13 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 18fcc6e48c..dfe4164900 100644 --- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -6,6 +6,9 @@ Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t Make it work with musl where comparison_fn_t and __compare_fn_t is not provided. +Revisit this when upgrading to 251+ systemd since systemd does not need +__compare_fn_t anymore + Upstream-Status: Inappropriate [musl specific] Signed-off-by: Alex Kiernan <[email protected]> diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 59bd81c76f..4cce9a3fe6 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -7,6 +7,9 @@ This is to avoid build failures like below for musl. locale-util.c:296:24: error: 'FTW_STOP' undeclared +Revisit this when upgrading to 251+ since most of these defines are not +needed anymore except FTW_CONTINUE + Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <[email protected]> diff --git a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 1fb84c7090..e7b7269f95 100644 --- a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -5,6 +5,9 @@ Subject: [PATCH] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] +Drop this when upgrading to 251+, systemd does not use +__register_atfork anymore + Signed-off-by: Chen Qi <[email protected]> --- diff --git a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch index cc20c3710a..82a01f732e 100644 --- a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch @@ -8,6 +8,10 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] +This is fixed upstream where systemd no longer needs M_PIl so it could +be dropped when upgrading to 251+ see +https://github.com/systemd/systemd/commit/f9a1fd2a3b2d8212ba84ef1c3b55657ced34475e + Signed-off-by: Chen Qi <[email protected]> --- -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166635): https://lists.openembedded.org/g/openembedded-core/message/166635 Mute This Topic: https://lists.openembedded.org/mt/91578417/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
