| Message ID | 1724833587-2225-2-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe] polkit: use update-alternatives to solve conflicts with systemd | expand |
This is problematic for the same reason as the similar change to systemd proposed in oe-core, and shouldn't be merged. Alex On Wed, 28 Aug 2024 at 10:26, wangmy via lists.openembedded.org <wangmy=fujitsu.com@lists.openembedded.org> wrote: > > From: Wang Mingyu <wangmy@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 > > systemd also uses the doc '/usr/share/polkit-1/rules.d'. > systemd has a priority of 50. > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > meta-oe/recipes-extended/polkit/polkit_125.bb | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/meta-oe/recipes-extended/polkit/polkit_125.bb b/meta-oe/recipes-extended/polkit/polkit_125.bb > index fe1ee467c..5ba9690c5 100644 > --- a/meta-oe/recipes-extended/polkit/polkit_125.bb > +++ b/meta-oe/recipes-extended/polkit/polkit_125.bb > @@ -43,6 +43,13 @@ USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysco > SYSTEMD_SERVICE:${PN} = "${BPN}.service" > SYSTEMD_AUTO_ENABLE = "disable" > > +inherit update-alternatives > + > +ALTERNATIVE_PRIORITY = "100" > +ALTERNATIVE:${PN} = "rules.d" > +ALTERNATIVE_TARGET[rules.d] = "${datadir}/polkit-1/rules.d" > +ALTERNATIVE_LINK_NAME[rules.d] = "${datadir}/polkit-1/rules.d" > + > do_install:append() { > #Fix up permissions on polkit rules.d to work with rpm4 constraints > if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#112026): https://lists.openembedded.org/g/openembedded-devel/message/112026 > Mute This Topic: https://lists.openembedded.org/mt/108138519/1686489 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/recipes-extended/polkit/polkit_125.bb b/meta-oe/recipes-extended/polkit/polkit_125.bb index fe1ee467c..5ba9690c5 100644 --- a/meta-oe/recipes-extended/polkit/polkit_125.bb +++ b/meta-oe/recipes-extended/polkit/polkit_125.bb @@ -43,6 +43,13 @@ USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysco SYSTEMD_SERVICE:${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "rules.d" +ALTERNATIVE_TARGET[rules.d] = "${datadir}/polkit-1/rules.d" +ALTERNATIVE_LINK_NAME[rules.d] = "${datadir}/polkit-1/rules.d" + do_install:append() { #Fix up permissions on polkit rules.d to work with rpm4 constraints if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then