Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: Luca Bocassi <luca.boccassi@gmail.com>,
	"openembedded-core@lists.openembedded.org"
	<openembedded-core@lists.openembedded.org>
Cc: "paul.eggleton@microsoft.com" <paul.eggleton@microsoft.com>
Subject: RE: [OE-core] [PATCH 1/8] systemd: skip chown when building for nativesdk
Date: Wed, 17 Nov 2021 18:14:00 +0000	[thread overview]
Message-ID: <9151407a13a544628bf14e106277474d@axis.com> (raw)
In-Reply-To: <20211117123201.111905-2-luca.boccassi@gmail.com>

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Luca Bocassi
> Sent: den 17 november 2021 13:32
> To: openembedded-core@lists.openembedded.org
> Cc: paul.eggleton@microsoft.com
> Subject: [OE-core] [PATCH 1/8] systemd: skip chown when building for nativesdk
> 
> From: Luca Boccassi <luca.boccassi@microsoft.com>
> 
> The useradd class is a no-op in the nativesdk case, so chown will fail.
> Skip them.
> 
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> ---
>  meta/recipes-core/systemd/systemd_249.5.bb | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_249.5.bb b/meta/recipes-core/systemd/systemd_249.5.bb
> index 8bdc0ca028..2f019a4b1f 100644
> --- a/meta/recipes-core/systemd/systemd_249.5.bb
> +++ b/meta/recipes-core/systemd/systemd_249.5.bb
> @@ -275,7 +275,10 @@ do_install() {
>  		# which is expected to be empty.
>  		rm -rf ${D}${localstatedir}/log
>  	else
> -		chown root:systemd-journal ${D}${localstatedir}/log/journal
> +		# The useradd class is a no-op in the nativesdk case, so chown will fail
> +		if [ "${PN}" != "nativesdk-systemd" ]; then

If you change that if statement here and below to:

		if [ "${PN}" = "${BPN}" ]; then

then it will apply just as well if anyone introduces systemd-native.

> +			chown root:systemd-journal ${D}${localstatedir}/log/journal
> +		fi
> 
>  		# journal-remote creates this at start
>  		rm -rf ${D}${localstatedir}/log/journal/remote
> @@ -319,7 +322,10 @@ do_install() {
>  	if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
>  		if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
>  			chmod 700 ${D}${datadir}/polkit-1/rules.d
> -			chown polkitd:root ${D}${datadir}/polkit-1/rules.d
> +			# The useradd class is a no-op in the nativesdk case, so chown will fail
> +			if [ "${PN}" != "nativesdk-systemd" ]; then
> +				chown polkitd:root ${D}${datadir}/polkit-1/rules.d
> +			fi
>  		fi
>  	fi
> 
> --
> 2.30.2

//Peter



  reply	other threads:[~2021-11-17 18:14 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-17 12:31 [PATCH 0/8] systemd: allow building for nativesdk luca.boccassi
2021-11-17 12:31 ` [PATCH 1/8] systemd: skip chown when " luca.boccassi
2021-11-17 18:14   ` Peter Kjellerstedt [this message]
2021-11-17 18:32     ` [OE-core] " Luca Boccassi
2021-11-19 11:35       ` Luca Boccassi
2021-11-17 12:31 ` [PATCH 2/8] systemd: skip postinst in nativesdk builds luca.boccassi
2021-11-17 12:31 ` [PATCH 3/8] systemd: remove /var " luca.boccassi
2021-11-17 12:31 ` [PATCH 4/8] volatile-binds: " luca.boccassi
2021-11-17 12:31 ` [PATCH 5/8] volatile-binds: add nativesdk luca.boccassi
2021-11-17 17:40   ` [OE-core] " Richard Purdie
2021-11-17 17:42     ` Luca Boccassi
2021-11-19 11:36       ` Luca Boccassi
2021-11-17 12:31 ` [PATCH 6/8] kbd: " luca.boccassi
2021-11-17 17:43   ` [OE-core] " Richard Purdie
2021-11-17 17:58     ` Luca Boccassi
2021-11-17 12:32 ` [PATCH 7/8] os-release: " luca.boccassi
2021-11-17 12:32 ` [PATCH 8/8] systemd: " luca.boccassi
2021-11-17 12:53 ` [OE-core] [PATCH 0/8] systemd: allow building for nativesdk Alexander Kanavin
2021-11-17 14:59   ` Luca Boccassi
2021-11-17 15:07     ` Alexander Kanavin
2021-11-17 16:11       ` Luca Boccassi
2021-11-17 16:44         ` Alexander Kanavin
2021-11-17 17:41           ` Luca Boccassi
2021-11-17 17:49             ` Alexander Kanavin
2021-11-17 18:04               ` Luca Boccassi
2021-11-17 19:50                 ` Alexander Kanavin
2021-11-19  1:43 ` ChenQi
2021-11-19 11:26   ` Luca Boccassi
2021-11-22  3:32     ` ChenQi
2021-11-19 11:34 ` [PATCH v2 1/7] systemd: skip chown when " luca.boccassi
2021-11-19 11:34   ` [PATCH v2 2/7] systemd: skip postinst in nativesdk builds luca.boccassi
2021-11-19 11:34   ` [PATCH v2 3/7] systemd: remove /var " luca.boccassi
2021-11-19 11:34   ` [PATCH v2 4/7] systemd: remove volatile-binds RDEPENDS for nativesdk luca.boccassi
2021-11-22 11:56     ` [OE-core] " Richard Purdie
2021-11-22 22:51       ` Luca Boccassi
2021-11-19 11:34   ` [PATCH v2 5/7] kbd: add nativesdk luca.boccassi
2021-11-19 11:34   ` [PATCH v2 6/7] os-release: " luca.boccassi
2021-11-19 11:34   ` [PATCH v2 7/7] systemd: " luca.boccassi
2021-11-19 11:39     ` [OE-core] " Alexander Kanavin
2021-11-19 11:55       ` Luca Boccassi
2021-11-22 12:46   ` [OE-core] [PATCH v2 1/7] systemd: skip chown when building for nativesdk Richard Purdie
2021-11-22 13:57   ` Konrad Weihmann
2021-11-22 14:17     ` Alexander Kanavin
2021-11-22 22:47     ` Luca Boccassi
2021-11-24  8:09       ` Konrad Weihmann
2021-11-24 11:53         ` Luca Boccassi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9151407a13a544628bf14e106277474d@axis.com \
    --to=peter.kjellerstedt@axis.com \
    --cc=luca.boccassi@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=paul.eggleton@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox