From: Wang Mingyu <wan...@fujitsu.com>

Error: Transaction test error:
  file /usr/share/polkit-1/rules.d conflicts between attempted installs of 
polkit-125-r0.core2_64 and systemd-1:256.5-r0.core2_64

polkit also uses the doc '/usr/share/polkit-1/rules.d'.
polkit has a priority of 100.

Signed-off-by: Wang Mingyu <wan...@fujitsu.com>
---
 meta/recipes-core/systemd/systemd_256.5.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_256.5.bb 
b/meta/recipes-core/systemd/systemd_256.5.bb
index ee656c81e5..1c408d075f 100644
--- a/meta/recipes-core/systemd/systemd_256.5.bb
+++ b/meta/recipes-core/systemd/systemd_256.5.bb
@@ -848,7 +848,7 @@ python do_warn_musl() {
 }
 addtask warn_musl before do_configure
 
-ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel 
${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
+ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel rules.d 
${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
 
 ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd"
 ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf"
@@ -874,6 +874,10 @@ ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl"
 ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel"
 ALTERNATIVE_PRIORITY[runlevel] ?= "300"
 
+ALTERNATIVE_TARGET[rules.d] = "${datadir_native}/polkit-1/rules.d"
+ALTERNATIVE_LINK_NAME[rules.d] = "${datadir_native}/polkit-1/rules.d"
+ALTERNATIVE_PRIORITY[rules.d] ?= "50"
+
 pkg_postinst:${PN}:libc-glibc () {
        if ${@bb.utils.contains('PACKAGECONFIG', 'myhostname', 'true', 'false', 
d)}; then
                sed -e '/^hosts:/s/\s*\<myhostname\>//' \
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203869): 
https://lists.openembedded.org/g/openembedded-core/message/203869
Mute This Topic: https://lists.openembedded.org/mt/108138529/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to