diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-17 09:15:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-17 11:31:32 +0100 |
| commit | a6e91db198ae5b77986de25331631d894c7b97d1 (patch) | |
| tree | 29091286510fd225363a92a66c69148c7057ab2e | |
| parent | c49af6de052a45f05d948f61e207c9d168ee10b2 (diff) | |
| download | openembedded-core-a6e91db198ae5b77986de25331631d894c7b97d1.tar.gz openembedded-core-a6e91db198ae5b77986de25331631d894c7b97d1.tar.bz2 openembedded-core-a6e91db198ae5b77986de25331631d894c7b97d1.zip | |
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit/sepbuildfix.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit_0.4.5.bb | 3 |
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 @@ +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 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" 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" |