diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit')
2 files changed, 52 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch b/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch new file mode 100644 index 000000000..ad879d466 --- /dev/null +++ b/import-layers/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/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch b/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch new file mode 100644 index 000000000..f2f9b9c68 --- /dev/null +++ b/import-layers/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) |
