From fe614b1dced8d1afbca2c4f770dcd09e5039124d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 7 Mar 2013 17:54:00 +0000 Subject: consolekit: make policykit an option, and disable by default 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. (From OE-Core rev: ead060e668b0073f304a696f3fba9dbe24869f90) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/consolekit/consolekit_0.4.5.bb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'meta') diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index e510c451b8..f6a554f87d 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}" - -- cgit v1.2.3-54-g00ecf