diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2024-01-02 11:31:19 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-26 16:06:29 +0000 |
commit | 1e77bf05a103eeefcfc77537e4eae265e944ca93 (patch) | |
tree | 0cb3ed4799fac10603cf1a1f40168cc36c719512 /meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch | |
parent | 5ae14523a72d854c41c234969a9221b078719a21 (diff) | |
download | poky-1e77bf05a103eeefcfc77537e4eae265e944ca93.tar.gz |
systemd: refresh musl patches for v255.1
The current patches are refreshed. A new patch is added:
0022-avoid-missing-LOCK_EX-declaration.patch
(From OE-Core rev: b86b1f1265b87f73ea132a9c0d3b1978972ad41b)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch new file mode 100644 index 0000000000..a1dfca22cd --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From dad7f897c0de654fa5592fda3e90f874639849f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 25 Feb 2019 15:00:06 +0800 | ||
4 | Subject: [PATCH 05/22] add missing FTW_ macros for musl | ||
5 | |||
6 | This is to avoid build failures like below for musl. | ||
7 | |||
8 | locale-util.c:296:24: error: 'FTW_STOP' undeclared | ||
9 | |||
10 | Upstream-Status: Inappropriate [musl specific] | ||
11 | |||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
13 | --- | ||
14 | src/basic/missing_type.h | 4 ++++ | ||
15 | src/test/test-recurse-dir.c | 1 + | ||
16 | 2 files changed, 5 insertions(+) | ||
17 | |||
18 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | ||
19 | index 6c0456349d..73a5b90e3c 100644 | ||
20 | --- a/src/basic/missing_type.h | ||
21 | +++ b/src/basic/missing_type.h | ||
22 | @@ -14,3 +14,7 @@ | ||
23 | #ifndef __GLIBC__ | ||
24 | typedef int (*comparison_fn_t)(const void *, const void *); | ||
25 | #endif | ||
26 | + | ||
27 | +#ifndef FTW_CONTINUE | ||
28 | +#define FTW_CONTINUE 0 | ||
29 | +#endif | ||
30 | diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c | ||
31 | index 8684d064ec..70fc2b5376 100644 | ||
32 | --- a/src/test/test-recurse-dir.c | ||
33 | +++ b/src/test/test-recurse-dir.c | ||
34 | @@ -8,6 +8,7 @@ | ||
35 | #include "recurse-dir.h" | ||
36 | #include "strv.h" | ||
37 | #include "tests.h" | ||
38 | +#include "missing_type.h" | ||
39 | |||
40 | static char **list_nftw = NULL; | ||
41 | |||
42 | -- | ||
43 | 2.34.1 | ||
44 | |||