From 626364981cd1ee5facf600b4b5bb9d083971e151 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 11 Oct 2019 10:06:28 +0200 Subject: polkit-group-rules: Fix error in do_rootfs for rpm package-manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * An issue in meta-mortsgna was reported. Discussion is found at [1] * We do similar in meta-gnome's gvfs for same reason [2] * This is a bugfix which should apply and work for many release-branches Fixes: | Error: Transaction check error: | file /etc/polkit-1/rules.d conflicts between attempted installs of polkit-group-rule-datetime-1.0-r0.cortexa7t2hf_neon_vfpv4 and polkit-0.115-r0.cortexa7t2hf_neon_vfpv4 [1] https://github.com/schnitzeltony/meta-mortsgna/issues/11 [2] https://github.com/openembedded/meta-openembedded/blob/fd1a0c9210b162ccb147e933984c755d32899efc/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb#L72 Signed-off-by: Andreas Müller Signed-off-by: Khem Raj (cherry picked from commit a47d38561249411449cc62ba878eb7c36916fe55) Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/polkit/polkit-group-rule.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 06ab10642..8ced8abe5 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -8,6 +8,6 @@ inherit useradd do_install_prepend() { install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d + chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d } USERADD_PARAM_${PN}_prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" -- cgit v1.2.3-54-g00ecf