diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch | 17 |
1 files changed, 12 insertions, 5 deletions
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 57e18a5808..59bd81c76f 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7ca9887f84adba065dc2e59b3de55ace2fc72ec0 Mon Sep 17 00:00:00 2001 | 1 | From a0450f7909348e7ff1d58adc0aee4119a0519c1f 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 15:00:06 +0800 | 3 | Date: Mon, 25 Feb 2019 15:00:06 +0800 |
4 | Subject: [PATCH] add missing FTW_ macros for musl | 4 | Subject: [PATCH] add missing FTW_ macros for musl |
@@ -12,13 +12,16 @@ Upstream-Status: Inappropriate [musl specific] | |||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
13 | 13 | ||
14 | --- | 14 | --- |
15 | src/basic/missing_type.h | 20 ++++++++++++++++++++ | 15 | src/basic/missing_type.h | 20 ++++++++++++++++++++ |
16 | src/shared/mount-setup.c | 1 + | 16 | src/shared/mount-setup.c | 1 + |
17 | 2 files changed, 21 insertions(+) | 17 | src/test/test-recurse-dir.c | 1 + |
18 | 3 files changed, 22 insertions(+) | ||
18 | 19 | ||
20 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | ||
21 | index aeaf6ad5ec..3df1084ef2 100644 | ||
19 | --- a/src/basic/missing_type.h | 22 | --- a/src/basic/missing_type.h |
20 | +++ b/src/basic/missing_type.h | 23 | +++ b/src/basic/missing_type.h |
21 | @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const voi | 24 | @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); |
22 | #define __COMPAR_FN_T | 25 | #define __COMPAR_FN_T |
23 | typedef int (*__compar_fn_t)(const void *, const void *); | 26 | typedef int (*__compar_fn_t)(const void *, const void *); |
24 | #endif | 27 | #endif |
@@ -42,6 +45,8 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
42 | +#ifndef FTW_SKIP_SIBLINGS | 45 | +#ifndef FTW_SKIP_SIBLINGS |
43 | +#define FTW_SKIP_SIBLINGS 3 | 46 | +#define FTW_SKIP_SIBLINGS 3 |
44 | +#endif | 47 | +#endif |
48 | diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c | ||
49 | index 7917968497..cc3d5baaab 100644 | ||
45 | --- a/src/shared/mount-setup.c | 50 | --- a/src/shared/mount-setup.c |
46 | +++ b/src/shared/mount-setup.c | 51 | +++ b/src/shared/mount-setup.c |
47 | @@ -32,6 +32,7 @@ | 52 | @@ -32,6 +32,7 @@ |
@@ -52,6 +57,8 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
52 | 57 | ||
53 | typedef enum MountMode { | 58 | typedef enum MountMode { |
54 | MNT_NONE = 0, | 59 | MNT_NONE = 0, |
60 | diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c | ||
61 | index 2c2120b136..bc60a178a2 100644 | ||
55 | --- a/src/test/test-recurse-dir.c | 62 | --- a/src/test/test-recurse-dir.c |
56 | +++ b/src/test/test-recurse-dir.c | 63 | +++ b/src/test/test-recurse-dir.c |
57 | @@ -6,6 +6,7 @@ | 64 | @@ -6,6 +6,7 @@ |