* [PATCH] systemd: add missing include for musl
@ 2021-10-18 12:02 Yureka
2021-10-18 12:18 ` [OE-core] " Alexander Kanavin
0 siblings, 1 reply; 3+ messages in thread
From: Yureka @ 2021-10-18 12:02 UTC (permalink / raw)
To: openembedded-core; +Cc: Yureka
Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this
function)" in src/shared/mount-setup.c.
Signed-off-by: Yureka <yuka@yuka.dev>
---
.../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 95c3000aa1..792727ed8e 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.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] systemd: add missing include for musl
2021-10-18 12:02 [PATCH] systemd: add missing include for musl Yureka
@ 2021-10-18 12:18 ` Alexander Kanavin
2021-10-18 13:43 ` Yureka
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Kanavin @ 2021-10-18 12:18 UTC (permalink / raw)
To: yuka; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2323 bytes --]
The recipe needs to be adjusted as well?
Alex
On Mon, 18 Oct 2021 at 14:03, Yureka via lists.openembedded.org <yuka=
yuka.dev@lists.openembedded.org> wrote:
> Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this
> function)" in src/shared/mount-setup.c.
>
> Signed-off-by: Yureka <yuka@yuka.dev>
> ---
> .../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 95c3000aa1..792727ed8e 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.33.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157055):
> https://lists.openembedded.org/g/openembedded-core/message/157055
> Mute This Topic: https://lists.openembedded.org/mt/86411771/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
[-- Attachment #2: Type: text/html, Size: 3439 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] systemd: add missing include for musl
2021-10-18 12:18 ` [OE-core] " Alexander Kanavin
@ 2021-10-18 13:43 ` Yureka
0 siblings, 0 replies; 3+ messages in thread
From: Yureka @ 2021-10-18 13:43 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2815 bytes --]
I don't think so, this change an existing related patch instead of
adding a new one.
On 10/18/21 14:18, Alexander Kanavin wrote:
> The recipe needs to be adjusted as well?
>
> Alex
>
> On Mon, 18 Oct 2021 at 14:03, Yureka via lists.openembedded.org
> <http://lists.openembedded.org> <yuka=yuka.dev@lists.openembedded.org>
> wrote:
>
> Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this
> function)" in src/shared/mount-setup.c.
>
> Signed-off-by: Yureka <yuka@yuka.dev>
> ---
> .../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 95c3000aa1..792727ed8e 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.33.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157055):
> https://lists.openembedded.org/g/openembedded-core/message/157055
> Mute This Topic: https://lists.openembedded.org/mt/86411771/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> <mailto:openembedded-core%2Bowner@lists.openembedded.org>
> Unsubscribe:
> https://lists.openembedded.org/g/openembedded-core/unsub
> [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
[-- Attachment #2: Type: text/html, Size: 5350 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-18 13:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-18 12:02 [PATCH] systemd: add missing include for musl Yureka
2021-10-18 12:18 ` [OE-core] " Alexander Kanavin
2021-10-18 13:43 ` Yureka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).