mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

consolekit: make policykit an option, and disable by default

Browse Source 
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>
This commit is contained in:
Ross Burton
2013-03-07 17:54:00 +00:00
committed by Richard Purdie
parent fb9bd465fa
commit fe614b1dce
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/consolekit/consolekit_0.4.5.bb
+8 -10
View File
@@ -8,12 +8,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3" file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
POLKIT = "polkit" DEPENDS = "glib-2.0 dbus virtual/libx11"
POLKIT_libc-uclibc = ""
POLKITCONF = ""
POLKITCONF_libc-uclibc = "--disable-policykit"
DEPENDS = "glib-2.0 dbus ${POLKIT} ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} virtual/libx11"
RDEPENDS_${PN} += "base-files" RDEPENDS_${PN} += "base-files"
inherit gnome inherit gnome
@@ -25,9 +20,13 @@ SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368
S = "${WORKDIR}/ConsoleKit-${PV}" S = "${WORKDIR}/ConsoleKit-${PV}"
EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${systemd_unitdir}/system/ \ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', 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 \ FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \
@@ -37,4 +36,3 @@ FILES_${PN}-dbg += "${base_libdir}/security/.debug"
PACKAGES =+ "pam-plugin-ck-connector" PACKAGES =+ "pam-plugin-ck-connector"
FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so" FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so"
RDEPENDS_pam-plugin-ck-connector += "${PN}" RDEPENDS_pam-plugin-ck-connector += "${PN}"