From 5e3df5ad4fe4a93208110a1ff40c5e3ce09f6269 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Wed, 14 Jun 2023 16:04:49 +0200 Subject: [PATCH] polkit-rule-agl-app: try to prevent transaction error While creating the final filesystem we see this error in CI: Running transaction test Error: Transaction test error: file /etc/polkit-1/rules.d conflicts between attempted installs of polkit-rule-agl-app-1.0-r0.11.corei7_64 and polkit-0.119-r0.11.corei7_64 ERROR: Logfile of failure stored in: /w/workspace/release-jjb-pike-snapshot/MACHINE/qemux86-64/label/agl-test-slave/repoclone/output/tmp/work/qemux86_64-agl-linux/agl-demo-platform-crosssdk/1.0-r0/temp/log.do_rootfs.44779 NOTE: recipe agl-demo-platform-crosssdk-1.0-r0: task do_rootfs: Failed Try to work this around. Bug-AGL: SPEC-4837 Change-Id: I855bfe88651cc5e738630936639e599523eb811c Signed-off-by: Jan-Simon Moeller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29016 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- .../recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb b/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb index 920bb86b3..fe6ecf863 100644 --- a/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb +++ b/meta-app-framework/recipes-config/polkit-rule-agl-app/polkit-rule-agl-app.bb @@ -10,7 +10,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "polkit" do_install() { - install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d - install -m 0644 ${WORKDIR}/50-agl-app.rules ${D}${sysconfdir}/polkit-1/rules.d + install -m 700 -d ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + install -m 0644 ${WORKDIR}/50-agl-app.rules ${D}${datadir}/polkit-1/rules.d } + +FILES:${PN} += "${datadir}/polkit-1/rules.d/*.rules" -- 2.16.6