[oe-commits] [meta-openembedded] 02/10: polkit-group-rules: Fix error in do_rootfs for rpm package-manager

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch warrior-next
in repository meta-openembedded.

commit 626364981cd1ee5facf600b4b5bb9d083971e151
Author: Andreas Müller <schnitzeltony at gmail.com>
AuthorDate: Fri Oct 11 10:06:28 2019 +0200

    polkit-group-rules: Fix error in do_rootfs for rpm package-manager
    
    * 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 <schnitzeltony at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    (cherry picked from commit a47d38561249411449cc62ba878eb7c36916fe55)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 06ab106..8ced8ab 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;"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.