diff mbox series

[v2,2/2] gutenprint: match ownership on /etc/cups

Message ID 20230524140505.3623976-2-ross.burton@arm.com
State Under Review
Headers show
Series [v2,1/2] gutenprint: rewrite recipe and update | expand

Commit Message

Ross Burton May 24, 2023, 2:05 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

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 <ross.burton@arm.com>
---
 meta-oe/recipes-printing/gutenprint/gutenprint_git.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
diff mbox series

Patch

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"