consolekit: make policykit an option, and disable by default

Submitted by Ross Burton on March 7, 2013, 5:54 p.m.

Details

Message ID 1362678841-12200-1-git-send-email-ross.burton@intel.com
State Accepted
Commit ead060e668b0073f304a696f3fba9dbe24869f90
Headers show

Commit Message

Ross Burton March 7, 2013, 5:54 p.m.
Make PolicyKit usage a PACKAGECONFIG option, and disable it by default.  Also
migrate pam to use PACKAGECONFIG, and add systemd too.

ConsoleKit doesn't currently have an option to force this on or off, so rely on
a build-dependency for now.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-support/consolekit/consolekit_0.4.5.bb |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
index e510c45..f6a554f 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
@@ -8,12 +8,7 @@  LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
 
-POLKIT = "polkit"
-POLKIT_libc-uclibc = ""
-POLKITCONF = ""
-POLKITCONF_libc-uclibc = "--disable-policykit"
-
-DEPENDS = "glib-2.0 dbus ${POLKIT} ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} virtual/libx11"
+DEPENDS = "glib-2.0 dbus virtual/libx11"
 RDEPENDS_${PN} += "base-files"
 
 inherit gnome
@@ -25,9 +20,13 @@  SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368
 
 S = "${WORKDIR}/ConsoleKit-${PV}"
 
-EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
-                ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \
-               "
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
+PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
+# No option to turn it on or off, so rely on the build dependency for now.
+PACKAGECONFIG[policykit] = ",,polkit"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir="
 
 FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
                 ${libdir}/ConsoleKit  ${systemd_unitdir} ${base_libdir} \
@@ -37,4 +36,3 @@  FILES_${PN}-dbg += "${base_libdir}/security/.debug"
 PACKAGES =+ "pam-plugin-ck-connector"
 FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so"
 RDEPENDS_pam-plugin-ck-connector += "${PN}"
-