summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYureka <yuka@yuka.dev>2021-10-18 14:02:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-29 11:17:26 +0100
commit91527514f3221fa28fa2799d7e4bff790d652754 (patch)
treea66c5ec9d5b2e5e7bae438273b25ffe6e2bfd484 /meta
parent4f97823c125a671abca423b122fd26fb24b4c644 (diff)
downloadpoky-91527514f3221fa28fa2799d7e4bff790d652754.tar.gz
systemd: add missing include for musl
Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this function)" in src/shared/mount-setup.c. (From OE-Core rev: 1c4c9f68f13d40bfea489fe27556b85e59255da8) Signed-off-by: Yureka <yuka@yuka.dev> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7707d08bb10db5eb782a2476be58ebe4b8bba154) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch16
1 files changed, 14 insertions, 2 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 1de7ccf150..444e123854 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
@@ -10,10 +10,10 @@ This is to avoid build failures like below for musl.
10Upstream-Status: Inappropriate [musl specific] 10Upstream-Status: Inappropriate [musl specific]
11 11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13
14--- 13---
15 src/basic/missing_type.h | 20 ++++++++++++++++++++ 14 src/basic/missing_type.h | 20 ++++++++++++++++++++
16 1 file changed, 20 insertions(+) 15 src/shared/mount-setup.c | 1 +
16 2 files changed, 21 insertions(+)
17 17
18diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h 18diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
19index aeaf6ad5ec..3df1084ef2 100644 19index aeaf6ad5ec..3df1084ef2 100644
@@ -43,3 +43,15 @@ index aeaf6ad5ec..3df1084ef2 100644
43+#ifndef FTW_SKIP_SIBLINGS 43+#ifndef FTW_SKIP_SIBLINGS
44+#define FTW_SKIP_SIBLINGS 3 44+#define FTW_SKIP_SIBLINGS 3
45+#endif 45+#endif
46diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
47index ef3527e9a7..c1cab40eb8 100644
48--- a/src/shared/mount-setup.c
49+++ b/src/shared/mount-setup.c
50@@ -32,6 +32,7 @@
51 #include "strv.h"
52 #include "user-util.h"
53 #include "virt.h"
54+#include "missing_type.h"
55
56 typedef enum MountMode {
57 MNT_NONE = 0,