summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasir-Khan <yasir_khan@mentor.com>2014-08-13 18:48:13 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:50 +0100
commit276285bfa26c5142a5f4869d6670f37bb91da5db (patch)
treeaf98e7772b71b1992bd96124fe5ce83edbba98d2
parent0cd5af027234735fe83d0681dbdddb197c02f262 (diff)
downloadpoky-276285bfa26c5142a5f4869d6670f37bb91da5db.tar.gz
consolekit: allow explicit enable/disable of polkit
Adds the configure option to enable/disable policykit. (From OE-Core rev: 66d53c40f1eb614803a34dfa3741b170785c637d) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Yasir-Khan <yasir_khan@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch33
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.6.bb7
2 files changed, 37 insertions, 3 deletions
diff --git a/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch b/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
new file mode 100644
index 0000000000..ad879d466b
--- /dev/null
+++ b/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
@@ -0,0 +1,33 @@
1Upstream-Status: Pending
2
3--- ConsoleKit-0.4.6.orig/configure.ac
4+++ ConsoleKit-0.4.6/configure.ac
5@@ -56,10 +56,24 @@ PKG_CHECK_MODULES(CONSOLE_KIT,
6 gthread-2.0 >= $GLIB_REQUIRED_VERSION
7 )
8
9-PKG_CHECK_MODULES(POLKIT,
10- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
11- have_polkit=yes,
12- have_polkit=no)
13+AC_ARG_WITH([polkit],
14+ [AS_HELP_STRING([--with-polkit],
15+ [support PolicyKit @<:@default=check@:>@])],
16+ [],
17+ [with_polkit=check])
18+
19+AS_IF([test "x$with_polkit" != xno],
20+ [PKG_CHECK_MODULES(POLKIT,
21+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
22+ have_polkit=yes,
23+ [if test "x$with_polkit" != xcheck; then
24+ AC_MSG_FAILURE(
25+ [--with-polkit was given, but test for polkit failed])
26+ else
27+ have_polkit=no
28+ fi
29+ ])])
30+
31 if test "x$have_polkit" = "xyes" ; then
32 AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
33 fi
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 98516166cf..643850f8ef 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -12,7 +12,9 @@ RDEPENDS_${PN} += "base-files"
12inherit autotools pkgconfig 12inherit autotools pkgconfig
13 13
14SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \ 14SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \
15 file://sepbuildfix.patch" 15 file://sepbuildfix.patch \
16 file://add-polkit-configure-argument.patch \
17"
16 18
17SRC_URI[md5sum] = "611792b4d616253a5bdec9175f8b7678" 19SRC_URI[md5sum] = "611792b4d616253a5bdec9175f8b7678"
18SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c" 20SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c"
@@ -23,8 +25,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}
23 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 25 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
24 26
25PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" 27PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
26# No option to turn it on or off, so rely on the build dependency for now. 28PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit"
27PACKAGECONFIG[policykit] = ",,polkit"
28PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir=" 29PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir="
29 30
30FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \ 31FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \