diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support/consolekit')
3 files changed, 103 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch b/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch new file mode 100644 index 000000000..ad879d466 --- /dev/null +++ b/yocto-poky/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/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch b/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch new file mode 100644 index 000000000..f2f9b9c68 --- /dev/null +++ b/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch @@ -0,0 +1,19 @@ +Fix builds in the case of seprate source from the build directory. + +RP 2013/4/17 + +Upstream-Status: Pending + +Index: pam-ck-connector/Makefile.am +=================================================================== +--- consolekit/pam-ck-connector.orig/Makefile.am 2010-09-03 13:54:31.000000000 +0000 ++++ consolekit/pam-ck-connector/Makefile.am 2013-04-17 09:06:49.093524918 +0000 +@@ -4,7 +4,7 @@ + + INCLUDES = \ + $(LIBDBUS_CFLAGS) \ +- -I$(top_builddir)/libck-connector \ ++ -I$(top_srcdir)/libck-connector \ + $(NULL) + + pamlibdir = $(PAM_MODULE_DIR) diff --git a/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb new file mode 100644 index 000000000..66a892a7d --- /dev/null +++ b/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -0,0 +1,51 @@ +SUMMARY = "Framework for defining and tracking users, login sessions, and seats" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ConsoleKit" +BUGTRACKER = "https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3" + +DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib virtual/libx11" +RDEPENDS_${PN} += "base-files" + +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \ + file://sepbuildfix.patch \ + file://add-polkit-configure-argument.patch \ +" + +SRC_URI[md5sum] = "611792b4d616253a5bdec9175f8b7678" +SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c" + +S = "${WORKDIR}/ConsoleKit-${PV}" + +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" +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 \ + ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ + ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" +FILES_${PN}-dbg += "${base_libdir}/security/.debug" + +PACKAGES =+ "pam-plugin-ck-connector" +FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so" +RDEPENDS_pam-plugin-ck-connector += "${PN}" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/log/ConsoleKit - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf + fi + + # Remove /var/run from package as console-kit-daemon will populate it on startup + rm -fr "${D}${localstatedir}/run" +} |