From 625b2bfb80fb5406cda52e105f9031d82af54efe Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Apr 2013 09:15:11 +0000 Subject: [PATCH] consolekit: Fix ${S} != ${B} issues with pam enabled When pam is enabled an extra plugin is build and it references an incorrect directory when separate build directories are used. This patch corrects the issue. (From OE-Core rev: a6e91db198ae5b77986de25331631d894c7b97d1) Signed-off-by: Richard Purdie --- .../consolekit/consolekit/sepbuildfix.patch | 19 +++++++++++++++++++ meta/recipes-support/consolekit/consolekit_0.4.5.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/consolekit/consolekit/sepbuildfix.patch diff --git a/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch b/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch new file mode 100644 index 0000000..f2f9b9c --- /dev/null +++ b/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/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index a328108..db4ac00 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb @@ -13,7 +13,8 @@ RDEPENDS_${PN} += "base-files" inherit autotools pkgconfig -SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2" +SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2 \ + file://sepbuildfix.patch" SRC_URI[md5sum] = "f2657f93761206922d558471a936fbc3" SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38" -- 2.7.4