[honister][PATCH 33/37] systemd: add missing include for musl
From: Anuj Mittal <hidden>
Date: 2021-10-26 15:58:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Yureka <redacted> Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this function)" in src/shared/mount-setup.c. Signed-off-by: Yureka <redacted> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <redacted> (cherry picked from commit 7707d08bb10db5eb782a2476be58ebe4b8bba154) Signed-off-by: Anuj Mittal <redacted> --- .../0008-add-missing-FTW_-macros-for-musl.patch | 16 ++++++++++++++-- 1 file 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. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/basic/missing_type.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) + src/shared/mount-setup.c | 1 + + 2 files changed, 21 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h index aeaf6ad5ec..3df1084ef2 100644
@@ -43,3 +43,15 @@ index aeaf6ad5ec..3df1084ef2 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif +diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c +index ef3527e9a7..c1cab40eb8 100644 +--- a/src/shared/mount-setup.c ++++ b/src/shared/mount-setup.c +@@ -32,6 +32,7 @@ + #include "strv.h" + #include "user-util.h" + #include "virt.h" ++#include "missing_type.h" + + typedef enum MountMode { + MNT_NONE = 0,
--
2.31.1