summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-07 17:54:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-10 04:36:51 +0000
commitfe614b1dced8d1afbca2c4f770dcd09e5039124d (patch)
tree2a8a563d1d22ae97608d8c88822c94ec42fdc2bb /meta/recipes-support
parentfb9bd465fa8fe0ff8bd1ff6a061459758ed488d2 (diff)
downloadpoky-fe614b1dced8d1afbca2c4f770dcd09e5039124d.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.5.bb18
1 files changed, 8 insertions, 10 deletions
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+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
9 file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3" 9 file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
10 10
11POLKIT = "polkit" 11DEPENDS = "glib-2.0 dbus virtual/libx11"
12POLKIT_libc-uclibc = ""
13POLKITCONF = ""
14POLKITCONF_libc-uclibc = "--disable-policykit"
15
16DEPENDS = "glib-2.0 dbus ${POLKIT} ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} virtual/libx11"
17RDEPENDS_${PN} += "base-files" 12RDEPENDS_${PN} += "base-files"
18 13
19inherit gnome 14inherit gnome
@@ -25,9 +20,13 @@ SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368
25 20
26S = "${WORKDIR}/ConsoleKit-${PV}" 21S = "${WORKDIR}/ConsoleKit-${PV}"
27 22
28EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${systemd_unitdir}/system/ \ 23PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
29 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \ 24 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
30 " 25
26PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
27# No option to turn it on or off, so rely on the build dependency for now.
28PACKAGECONFIG[policykit] = ",,polkit"
29PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir="
31 30
32FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \ 31FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
33 ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ 32 ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \
@@ -37,4 +36,3 @@ FILES_${PN}-dbg += "${base_libdir}/security/.debug"
37PACKAGES =+ "pam-plugin-ck-connector" 36PACKAGES =+ "pam-plugin-ck-connector"
38FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so" 37FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so"
39RDEPENDS_pam-plugin-ck-connector += "${PN}" 38RDEPENDS_pam-plugin-ck-connector += "${PN}"
40