consolekit: Fix ${S} != ${B} issues with pam enabled

PATCH New Richard Purdie 1 participant 1 message Apr 17, 2013

Share & tools

Richard Purdie

author

2013-04-17 09:34 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-support/consolekit/consolekit/sepbuildfix.patch new file +19 -0

new file mode 100644
index 0000000..f2f9b9c
@@ -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)

meta/recipes-support/consolekit/consolekit_0.4.5.bb +2 -1

index a328108..db4ac00 100644
@@ -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"