mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

consolekit: allow explicit enable/disable of polkit

Browse Source 
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>
This commit is contained in:
Yasir-Khan
2014-08-13 18:48:13 +05:00
committed by Richard Purdie
parent 0cd5af0272
commit 276285bfa2
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
+33
View File
@@ -0,0 +1,33 @@
Upstream-Status: Pending
--- ConsoleKit-0.4.6.orig/configure.ac
+++ ConsoleKit-0.4.6/configure.ac
@@ -56,10 +56,24 @@ PKG_CHECK_MODULES(CONSOLE_KIT,
gthread-2.0 >= $GLIB_REQUIRED_VERSION
)
-PKG_CHECK_MODULES(POLKIT,
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
- have_polkit=yes,
- have_polkit=no)
+AC_ARG_WITH([polkit],
+ [AS_HELP_STRING([--with-polkit],
+ [support PolicyKit @<:@default=check@:>@])],
+ [],
+ [with_polkit=check])
+
+AS_IF([test "x$with_polkit" != xno],
+ [PKG_CHECK_MODULES(POLKIT,
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
+ have_polkit=yes,
+ [if test "x$with_polkit" != xcheck; then
+ AC_MSG_FAILURE(
+ [--with-polkit was given, but test for polkit failed])
+ else
+ have_polkit=no
+ fi
+ ])])
+
if test "x$have_polkit" = "xyes" ; then
AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
fi
meta/recipes-support/consolekit/consolekit_0.4.6.bb
+4 -3
View File
@@ -12,7 +12,9 @@ RDEPENDS_${PN} += "base-files"
inherit autotools pkgconfig inherit autotools pkgconfig
SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \ SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \
file://sepbuildfix.patch" file://sepbuildfix.patch \
file://add-polkit-configure-argument.patch \
"
SRC_URI[md5sum] = "611792b4d616253a5bdec9175f8b7678" SRC_URI[md5sum] = "611792b4d616253a5bdec9175f8b7678"
SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c" SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c"
@@ -23,8 +25,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" 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] = "--with-polkit,--without-polkit,polkit"
PACKAGECONFIG[policykit] = ",,polkit"
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir=" 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 \