diff options
author | Jiaqing Zhao <jiaqing.zhao@linux.intel.com> | 2022-05-23 10:20:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-23 21:31:31 +0100 |
commit | e50acb6e49ade1294429d3c3edf040e11fe28488 (patch) | |
tree | a361ee41010b0a5c8adb0c12062e953194f8d679 | |
parent | 7961559aa93c946f3d97cb7f79311b559adad90e (diff) | |
download | poky-e50acb6e49ade1294429d3c3edf040e11fe28488.tar.gz |
systemd: Remove __compare_fn_t type in musl-specific patch
Since systemd v250, commit d8f16737005e ("sort-util: avoid using
glibc's internal __compar_d_fn_t type"), __compare_fn_t type is no
longer used. This patch removes that type in the musl-specific patch.
(From OE-Core rev: 89c8a3f96dfeb444213fd6c523e1495c49065ccc)
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd/0003-missing_type.h-add-comparison_fn_t.patch (renamed from meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch) | 44 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | 14 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_250.5.bb | 2 |
3 files changed, 22 insertions, 38 deletions
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-comparison_fn_t.patch index dfe4164900..c28c8381e8 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-comparison_fn_t.patch | |||
@@ -1,13 +1,9 @@ | |||
1 | From a4f51ef07375466f79cb148ff1178ed11f808f0a Mon Sep 17 00:00:00 2001 | 1 | From 5513b918d02900a3a78fd0e0300a118b163edfef Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 | 3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 |
4 | Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t | 4 | Subject: [PATCH] missing_type.h: add comparison_fn_t |
5 | 5 | ||
6 | Make it work with musl where comparison_fn_t and __compare_fn_t | 6 | Make it work with musl where comparison_fn_t and is not provided. |
7 | is not provided. | ||
8 | |||
9 | Revisit this when upgrading to 251+ systemd since systemd does not need | ||
10 | __compare_fn_t anymore | ||
11 | 7 | ||
12 | Upstream-Status: Inappropriate [musl specific] | 8 | Upstream-Status: Inappropriate [musl specific] |
13 | 9 | ||
@@ -16,19 +12,19 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
16 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
17 | [Rebased for v242] | 13 | [Rebased for v242] |
18 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 14 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
19 | 15 | [Rebased for v250, Drop __compare_fn_t] | |
16 | Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> | ||
20 | --- | 17 | --- |
21 | src/basic/missing_type.h | 9 +++++++++ | 18 | src/basic/missing_type.h | 4 ++++ |
22 | src/basic/sort-util.h | 1 + | 19 | src/basic/sort-util.h | 1 + |
23 | src/core/kmod-setup.c | 1 + | ||
24 | src/libsystemd/sd-journal/catalog.c | 1 + | 20 | src/libsystemd/sd-journal/catalog.c | 1 + |
25 | 4 files changed, 12 insertions(+) | 21 | 3 files changed, 6 insertions(+) |
26 | 22 | ||
27 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 23 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
28 | index f6233090a9..aeaf6ad5ec 100644 | 24 | index f6233090a9..6c0456349d 100644 |
29 | --- a/src/basic/missing_type.h | 25 | --- a/src/basic/missing_type.h |
30 | +++ b/src/basic/missing_type.h | 26 | +++ b/src/basic/missing_type.h |
31 | @@ -10,3 +10,12 @@ | 27 | @@ -10,3 +10,7 @@ |
32 | #if !HAVE_CHAR16_T | 28 | #if !HAVE_CHAR16_T |
33 | #define char16_t uint16_t | 29 | #define char16_t uint16_t |
34 | #endif | 30 | #endif |
@@ -36,13 +32,8 @@ index f6233090a9..aeaf6ad5ec 100644 | |||
36 | +#ifndef __GLIBC__ | 32 | +#ifndef __GLIBC__ |
37 | +typedef int (*comparison_fn_t)(const void *, const void *); | 33 | +typedef int (*comparison_fn_t)(const void *, const void *); |
38 | +#endif | 34 | +#endif |
39 | + | ||
40 | +#ifndef __COMPAR_FN_T | ||
41 | +#define __COMPAR_FN_T | ||
42 | +typedef int (*__compar_fn_t)(const void *, const void *); | ||
43 | +#endif | ||
44 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | 35 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
45 | index cb448df109..fd738a65ab 100644 | 36 | index 02a6784d99..0b33c83d59 100644 |
46 | --- a/src/basic/sort-util.h | 37 | --- a/src/basic/sort-util.h |
47 | +++ b/src/basic/sort-util.h | 38 | +++ b/src/basic/sort-util.h |
48 | @@ -4,6 +4,7 @@ | 39 | @@ -4,6 +4,7 @@ |
@@ -53,18 +44,6 @@ index cb448df109..fd738a65ab 100644 | |||
53 | 44 | ||
54 | /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the | 45 | /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the |
55 | * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that | 46 | * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that |
56 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | ||
57 | index d054668b8e..d3bf55acbe 100644 | ||
58 | --- a/src/core/kmod-setup.c | ||
59 | +++ b/src/core/kmod-setup.c | ||
60 | @@ -10,6 +10,7 @@ | ||
61 | #include "macro.h" | ||
62 | #include "recurse-dir.h" | ||
63 | #include "string-util.h" | ||
64 | +#include "missing_type.h" | ||
65 | |||
66 | #if HAVE_KMOD | ||
67 | #include "module-util.h" | ||
68 | diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c | 47 | diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c |
69 | index 8fc87b131a..36a6efdbd8 100644 | 48 | index 8fc87b131a..36a6efdbd8 100644 |
70 | --- a/src/libsystemd/sd-journal/catalog.c | 49 | --- a/src/libsystemd/sd-journal/catalog.c |
@@ -77,3 +56,6 @@ index 8fc87b131a..36a6efdbd8 100644 | |||
77 | 56 | ||
78 | const char * const catalog_file_dirs[] = { | 57 | const char * const catalog_file_dirs[] = { |
79 | "/usr/local/lib/systemd/catalog/", | 58 | "/usr/local/lib/systemd/catalog/", |
59 | -- | ||
60 | 2.34.1 | ||
61 | |||
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 4b1fac06b5..680930ca3c 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 55d48dd81e57add5b2d4b5a7d697c575a0f37ef5 Mon Sep 17 00:00:00 2001 | 1 | From 106b7bd7186c9d6c1dcd72bd4ca6457d3fa72d0b Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 |
4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa | 4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa |
@@ -17,7 +17,6 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
17 | [rebased for systemd 244] | 17 | [rebased for systemd 244] |
18 | [Rebased for v247] | 18 | [Rebased for v247] |
19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | 19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> |
20 | |||
21 | --- | 20 | --- |
22 | meson.build | 1 + | 21 | meson.build | 1 + |
23 | src/backlight/backlight.c | 1 + | 22 | src/backlight/backlight.c | 1 + |
@@ -74,7 +73,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
74 | 52 files changed, 63 insertions(+) | 73 | 52 files changed, 63 insertions(+) |
75 | 74 | ||
76 | diff --git a/meson.build b/meson.build | 75 | diff --git a/meson.build b/meson.build |
77 | index ae53345260..8c8a6c9bdf 100644 | 76 | index cb9936ee8b..7ab201c6d9 100644 |
78 | --- a/meson.build | 77 | --- a/meson.build |
79 | +++ b/meson.build | 78 | +++ b/meson.build |
80 | @@ -507,6 +507,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] | 79 | @@ -507,6 +507,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] |
@@ -310,13 +309,13 @@ index 0b20d386d3..fccfb9268c 100644 | |||
310 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) | 309 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) |
311 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) | 310 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) |
312 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 311 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
313 | index d3bf55acbe..63dd807b8a 100644 | 312 | index d054668b8e..9b4caa7651 100644 |
314 | --- a/src/core/kmod-setup.c | 313 | --- a/src/core/kmod-setup.c |
315 | +++ b/src/core/kmod-setup.c | 314 | +++ b/src/core/kmod-setup.c |
316 | @@ -11,6 +11,7 @@ | 315 | @@ -10,6 +10,7 @@ |
316 | #include "macro.h" | ||
317 | #include "recurse-dir.h" | 317 | #include "recurse-dir.h" |
318 | #include "string-util.h" | 318 | #include "string-util.h" |
319 | #include "missing_type.h" | ||
320 | +#include "missing_stdlib.h" | 319 | +#include "missing_stdlib.h" |
321 | 320 | ||
322 | #if HAVE_KMOD | 321 | #if HAVE_KMOD |
@@ -705,3 +704,6 @@ index 1a384d6b38..0089833e3f 100644 | |||
705 | 704 | ||
706 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") | 705 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") |
707 | 706 | ||
707 | -- | ||
708 | 2.34.1 | ||
709 | |||
diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index aca140d4d4..6d6b3f2ded 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb | |||
@@ -31,7 +31,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
31 | SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" | 31 | SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" |
32 | SRC_URI_MUSL = "\ | 32 | SRC_URI_MUSL = "\ |
33 | file://0002-don-t-use-glibc-specific-qsort_r.patch \ | 33 | file://0002-don-t-use-glibc-specific-qsort_r.patch \ |
34 | file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ | 34 | file://0003-missing_type.h-add-comparison_fn_t.patch \ |
35 | file://0004-add-fallback-parse_printf_format-implementation.patch \ | 35 | file://0004-add-fallback-parse_printf_format-implementation.patch \ |
36 | file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ | 36 | file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ |
37 | file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ | 37 | file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ |