From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CC3FC433EF for ; Tue, 21 Jun 2022 08:53:33 +0000 (UTC) Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by mx.groups.io with SMTP id smtpd.web09.41253.1655801606103953911 for ; Tue, 21 Jun 2022 01:53:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=W6ezkzwX; spf=pass (domain: bootlin.com, ip: 217.70.178.232, mailfrom: luca.ceresoli@bootlin.com) Received: from booty (unknown [77.244.183.192]) (Authenticated sender: luca.ceresoli@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 02FBD200002; Tue, 21 Jun 2022 08:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1655801603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qY1QPzi4qPhGtFqryUxjRn4JF6jJHVibSM+u3e985HA=; b=W6ezkzwXYofwxU92+ZF6wI5lCkfjtTggaGmSfGb+tz513rIHODOYeU3FcmM6w020qN03Wc yq4UmP/L4Cgo7Gy0KLDxTttreJqhag4b/zoNiSZoPZA3btkkbN77f8tJLh0mD3Sd7wp3qq oq4BsENKZBULft/cTEVkx9G0kjyYf5lSAVa5tNMbmf1y/V4sOWvKEw320IuORCRT+yQChu fCvYwnI1IVIdPFdUY6v6D5rj7oIeo8IqHDyIQg4PD4Z/9l1Uxh6vFtxbbIXZOHx1ct7df1 BLf1iLsvjD3CxOj5GwTcQVCKPSUFsOJDTG7SQncpJi4hFIfKH2GUqwdrWLhN+Q== Date: Tue, 21 Jun 2022 10:53:21 +0200 From: Luca Ceresoli To: "Luca Ceresoli via lists.openembedded.org" Cc: luca.ceresoli@bootlin.com, "Pavel Zhukov" , openembedded-core@lists.openembedded.org, Pavel Zhukov Subject: Re: [OE-core] [PATCH 1/2] systemd: Add missed sys/file.h includes for musl Message-ID: <20220621105321.18764aac@booty> In-Reply-To: <16FA96825805EF68.617@lists.openembedded.org> References: <20220620161228.5267-1-pavel@zhukoff.net> <16FA96825805EF68.617@lists.openembedded.org> Organization: Bootlin X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Jun 2022 08:53:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167138 Hi Pavel, On Tue, 21 Jun 2022 10:48:13 +0200 "Luca Ceresoli via lists.openembedded.org" wrote: > Hi Pavel, > > On Mon, 20 Jun 2022 18:12:28 +0200 > "Pavel Zhukov" wrote: > > > Signed-off-by: Pavel Zhukov > > --- > > .../0001-Add-sys-file.h-for-LOCK_.patch | 80 +++++++++++++++++++ > > meta/recipes-core/systemd/systemd_251.2.bb | 2 +- > > 2 files changed, 81 insertions(+), 1 deletion(-) > > create mode 100644 meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch > > > > diff --git a/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch b/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch > > new file mode 100644 > > index 0000000000..25a1042a9d > > --- /dev/null > > +++ b/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch > > @@ -0,0 +1,80 @@ > > +From 7ae39374fda539aa613caeeee09be8d050a9bb79 Mon Sep 17 00:00:00 2001 > > +From: Pavel Zhukov > > +Date: Mon, 20 Jun 2022 11:24:52 +0200 > > +Subject: [PATCH] Add sys/file.h for LOCK_ > > +Cc: pavel@zhukoff.net > > + > > +Upstream-Status: Inappropriate [musl specific] > > + > > +Signed-off-by: Pavel Zhukov > > +--- > > + src/core/namespace.c | 1 + > > + src/dissect/dissect.c | 1 + > > + src/shared/dissect-image.c | 2 ++ > > + src/sysext/sysext.c | 1 + > > + src/test/test-loop-block.c | 1 + > > + 5 files changed, 6 insertions(+) > > + > > +diff --git a/src/core/namespace.c b/src/core/namespace.c > > +index 926aa96174..39f9e21c93 100644 > > +--- a/src/core/namespace.c > > ++++ b/src/core/namespace.c > > +@@ -7,6 +7,7 @@ > > + #include > > + #include > > + #include > > ++#include // For LOCK_ musl-specific > > + > > + #include "alloc-util.h" > > + #include "base-filesystem.h" > > +diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c > > +index bd94a755db..a0d2a6f287 100644 > > +--- a/src/dissect/dissect.c > > ++++ b/src/dissect/dissect.c > > +@@ -6,6 +6,7 @@ > > + #include > > + #include > > + #include > > ++#include // musl specific for LOCK_ > > + > > + #include "architecture.h" > > + #include "chase-symlinks.h" > > +diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c > > +index 1ab88839aa..a9e3fe4b44 100644 > > +--- a/src/shared/dissect-image.c > > ++++ b/src/shared/dissect-image.c > > +@@ -4,6 +4,8 @@ > > + #include > > + #endif > > + > > ++#include // For LOCK (musl specific) > > ++ > > + #include > > + #include > > + #include > > +diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c > > +index 364af195e0..85686c0fab 100644 > > +--- a/src/sysext/sysext.c > > ++++ b/src/sysext/sysext.c > > +@@ -5,6 +5,7 @@ > > + #include > > + #include > > + #include > > ++#include // LOCK_ (musl-specific) > > + > > + #include "capability-util.h" > > + #include "chase-symlinks.h" > > +diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c > > +index d1793222f0..6886c4cd31 100644 > > +--- a/src/test/test-loop-block.c > > ++++ b/src/test/test-loop-block.c > > +@@ -3,6 +3,7 @@ > > + #include > > + #include > > + #include > > ++#include > > Minor nit: better using always the same string. Now there 4 different > comments saying the same thing. > > > diff --git a/meta/recipes-core/systemd/systemd_251.2.bb b/meta/recipes-core/systemd/systemd_251.2.bb > > index 8370bec0ca..88216ccf6e 100644 > > --- a/meta/recipes-core/systemd/systemd_251.2.bb > > +++ b/meta/recipes-core/systemd/systemd_251.2.bb > > @@ -35,7 +35,6 @@ SRC_URI_MUSL = "\ > > file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ > > file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ > > file://0008-add-missing-FTW_-macros-for-musl.patch \ > > - file://0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ > > This line should be in patch 2/2. Now I noticed you already addressed both of my remarks in your v2 which has just reached my inbox. Sorry for the noise. -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com