From patchwork Wed May 24 14:05:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24391 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 94B76C7EE2C for ; Wed, 24 May 2023 14:05:45 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9752.1684937144996266223 for ; Wed, 24 May 2023 07:05:45 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B379B113E; Wed, 24 May 2023 07:06:29 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 354763F762; Wed, 24 May 2023 07:05:44 -0700 (PDT) From: ross.burton@arm.com To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH v2 2/2] gutenprint: match ownership on /etc/cups Date: Wed, 24 May 2023 15:05:05 +0100 Message-Id: <20230524140505.3623976-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230524140505.3623976-1-ross.burton@arm.com> References: <20230524140505.3623976-1-ross.burton@arm.com> MIME-Version: 1.0 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 ; Wed, 24 May 2023 14:05:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102777 From: Ross Burton This recipe currently uses DIRFILES to work around the fact that both cups and gutenprint ship /etc/cups but with different ownership. Instead of having mismatching ownership, we can simply match the ownership in gutenprint. Signed-off-by: Ross Burton --- meta-oe/recipes-printing/gutenprint/gutenprint_git.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb b/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb index d86858c85d..f0dc6adea0 100644 --- a/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb +++ b/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb @@ -51,6 +51,8 @@ do_configure() { do_install:append() { # This file contains build paths and isn't very useful, remove it rm -f ${D}${libdir}/gutenprint/*/config.summary + # Match ownership to cups + chgrp lp ${D}${sysconfdir}/cups } do_compile:class-native() { @@ -65,8 +67,8 @@ do_install:class-native() { FILES:${PN} += "${datadir}/cups/*" RDEPENDS:${PN} = "perl" -# Install in /etc/cups when RPM needs DIRFILES to not conflict -# https://stackoverflow.com/questions/44762430/why-do-i-get-etc-cups-conflicts-between-attempted-installs-in-yocto -DIRFILES = "1" - BBCLASSEXTEND = "native" + +# Pull in base-passwd for the lp user +DEPENDS:append:class-target = " base-passwd" +PACKAGE_WRITE_DEPS += "base-passwd"