summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 09:15:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 11:41:30 +0100
commit8593ead5ef187cac98629c256fb8623c6307d067 (patch)
treec77c6814a5d3b6d69613e7ce42ff2ceb29f7151f
parent595e92c76700306f9ff8fcf1557eb7ade1f3e907 (diff)
downloadpoky-8593ead5ef187cac98629c256fb8623c6307d067.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/consolekit/consolekit/sepbuildfix.patch19
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.5.bb3
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch b/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
new file mode 100644
index 0000000000..f2f9b9c682
--- /dev/null
+++ b/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
@@ -0,0 +1,19 @@
1Fix builds in the case of seprate source from the build directory.
2
3RP 2013/4/17
4
5Upstream-Status: Pending
6
7Index: pam-ck-connector/Makefile.am
8===================================================================
9--- consolekit/pam-ck-connector.orig/Makefile.am 2010-09-03 13:54:31.000000000 +0000
10+++ consolekit/pam-ck-connector/Makefile.am 2013-04-17 09:06:49.093524918 +0000
11@@ -4,7 +4,7 @@
12
13 INCLUDES = \
14 $(LIBDBUS_CFLAGS) \
15- -I$(top_builddir)/libck-connector \
16+ -I$(top_srcdir)/libck-connector \
17 $(NULL)
18
19 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 a3281083a9..db4ac00237 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"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2" 16SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2 \
17 file://sepbuildfix.patch"
17SRC_URI[md5sum] = "f2657f93761206922d558471a936fbc3" 18SRC_URI[md5sum] = "f2657f93761206922d558471a936fbc3"
18SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38" 19SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38"
19 20