Skip to contentSkip to conversation

polkit: Enable systemd support

PATCH In review Radu Moisan 4 participants 10 messages Feb 1, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 polkit: Enable systemd support

enable/disable support as relevant

---
 meta/recipes-extended/polkit/polkit_0.104.bb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-extended/polkit/polkit_0.104.bb +6 -1
index 2c0aaca..08e016a 100644
@@ -7,8 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
 
 DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
 
-PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                 ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to DEPENDS
+PACKAGECONFIG[consolekit] = ",,,consolekit"
 
 PR = "r9"
 
Signature · 1 line
1.7.9.5
#3 lore raw
In reply to Andreas Müller
Quoted 7 lines · Andreas Müller
Quoted 4 lines · Radu Moisan

enable/disable support as relevant

What caused my sign-off - or is it a hint that meta-oe/meta-systemd need alignment with this?

This patch is the meta-oe appends merged into oe-core - so yes once this has been integrated the meta-oe and meta-systemd bbappends can be removed.

Actually looking at the commit log, it appears that JaMa did the important commit so credit to him should be given.

Ross

#4 lore raw
Quoted 6 lines · Ross
Quoted 5 lines · Andreas Müller
Quoted 4 lines · Radu Moisan

enable/disable support as relevant

Quoted 8 lines
Quoted 2 lines

What caused my sign-off - or is it a hint that meta-oe/meta-systemd need alignment with this?

This patch is the meta-oe appends merged into oe-core - so yes once this has been integrated the meta-oe and meta-systemd bbappends can be removed.

Actually looking at the commit log, it appears that JaMa did the important commit so credit to him should be given.

Noted.

#5 lore raw
In reply to Radu Moisan
Quoted 1 line · Radu Moisan

enable/disable support as relevant

Please write a more verbose comment, something along the lines of "systemd is auto-detected unless disabled explicitly, potentially contaminating sstate".

Quoted 1 line

+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to DEPENDS

It's not picked up by shlibs because it's a dbus call not a library call, and that's *RDEPENDS* not depends.

Ross

#6 lore raw
Quoted 9 lines · Ross
Quoted 1 line · Radu Moisan

enable/disable support as relevant

Please write a more verbose comment, something along the lines of "systemd is auto-detected unless disabled explicitly, potentially contaminating sstate".

Quoted 1 line

+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to DEPENDS

It's not picked up by shlibs because it's a dbus call not a library call, and that's *RDEPENDS* not depends.

I did change that manually because I assumed it was a typo. However it make sense to add consolekit as a runtime dependency, but the documentation specifically says PACKAGECONFIG will add to DEPENDS. How is it different in this patch? The PACKAGECONFIG[systemd] is clearly specifying a build time dependency, why the PACKAGECONFIG[consolekit] is specifying a runtime dependency? How can I discriminate in this context?

Radu

#7 lore raw
Quoted 12 lines · Radu Moisan
Quoted 9 lines · Ross
Quoted 1 line · Radu Moisan

enable/disable support as relevant

Please write a more verbose comment, something along the lines of "systemd is auto-detected unless disabled explicitly, potentially contaminating sstate".

Quoted 1 line

+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to DEPENDS

It's not picked up by shlibs because it's a dbus call not a library call, and that's *RDEPENDS* not depends.

Quoted 6 lines

I did change that manually because I assumed it was a typo. However it make sense to add consolekit as a runtime dependency, but the documentation specifically says PACKAGECONFIG will add to DEPENDS. How is it different in this patch? The PACKAGECONFIG[systemd] is clearly specifying a build time dependency, why the PACKAGECONFIG[consolekit] is specifying a runtime dependency? How can I discriminate in this context?

3rd (DEPENDS) or 4th (RDEPENDS) parameter is the key difference.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#8 lore raw
In reply to Radu Moisan
Quoted 6 lines · Radu Moisan

I did change that manually because I assumed it was a typo. However it make sense to add consolekit as a runtime dependency, but the documentation specifically says PACKAGECONFIG will add to DEPENDS. How is it different in this patch? The PACKAGECONFIG[systemd] is clearly specifying a build time dependency, why the PACKAGECONFIG[consolekit] is specifying a runtime dependency? How can I discriminate in this context?

I spoke to Radu online already, but I'll repeat again here in case anyone else is confused by PACKAGECONFIG.

The latest documentation is here:
http://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html#var-P

The key point is that the 3rd argument is DEPENDS, and the fourth is RDEPENDS. Many instances of PACKAGECONFIG will leave out the fourth, but in this case the third is empty (note the extra commas) so consolekit is added as a runtime dependency.

Ross

#9 lore raw
Quoted 13 lines · Ross
Quoted 6 lines · Radu Moisan

I did change that manually because I assumed it was a typo. However it make sense to add consolekit as a runtime dependency, but the documentation specifically says PACKAGECONFIG will add to DEPENDS. How is it different in this patch? The PACKAGECONFIG[systemd] is clearly specifying a build time dependency, why the PACKAGECONFIG[consolekit] is specifying a runtime dependency? How can I discriminate in this context?

I spoke to Radu online already, but I'll repeat again here in case anyone else is confused by PACKAGECONFIG.

The latest documentation is here:
http://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html#var-P

Quoted 6 lines

The key point is that the 3rd argument is DEPENDS, and the fourth is RDEPENDS. Many instances of PACKAGECONFIG will leave out the fourth, but in this case the third is empty (note the extra commas) so consolekit is added as a runtime dependency.

Ross

Thanks guys for the clarification. Very useful info, I didn't notice the extra comma.

Radu