diff options
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit_0.4.6.bb | 7 |
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 @@ +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 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" inherit autotools pkgconfig 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[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c" @@ -23,8 +25,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', 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" -# No option to turn it on or off, so rely on the build dependency for now. -PACKAGECONFIG[policykit] = ",,polkit" +PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir=" FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \ |