diff options
| author | Maxin B. John <maxin.john@intel.com> | 2016-07-22 09:26:33 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:56:30 +0100 |
| commit | 6660e95cbf8b467bfb07bce18a7457639081f1d4 (patch) | |
| tree | d6d27431aadf81dc0c539beecd2f68cb3c1c188b /meta/recipes-kernel/sysprof/files | |
| parent | 71d0c871c991fc4959fa5b5e7ccbcbf140fa16b3 (diff) | |
| download | poky-6660e95cbf8b467bfb07bce18a7457639081f1d4.tar.gz | |
sysprof: fix floating dependency on polkit
Fix the floating dependency on polkit by providing a PACKAGECONFIG
option. Then, package the newly created files appropriately.
[YOCTO #9987]
(From OE-Core rev: a1ecd168b092a0cc7322431913fd1f42cfa9a37e)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/sysprof/files')
| -rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch b/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch new file mode 100644 index 0000000000..158d9975f2 --- /dev/null +++ b/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From 2b4005d72d3393933a7914be102ea65505c536cc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
| 3 | Date: Thu, 21 Jul 2016 11:53:31 +0300 | ||
| 4 | Subject: [PATCH] configure: Add option to enable/disable polkit | ||
| 5 | |||
| 6 | Changes the configure behaviour from autodetecting the polkit by default | ||
| 7 | to having an option to disable it explicitly | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
| 12 | --- | ||
| 13 | configure.ac | 8 ++++++++ | ||
| 14 | 1 file changed, 8 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/configure.ac b/configure.ac | ||
| 17 | index 2246d5a..3d3fe0f 100644 | ||
| 18 | --- a/configure.ac | ||
| 19 | +++ b/configure.ac | ||
| 20 | @@ -104,10 +104,18 @@ PKG_CHECK_MODULES(GTK, | ||
| 21 | [gtk+-3.0 >= gtk_required_version], | ||
| 22 | [have_gtk=yes], | ||
| 23 | [have_gtk=no]) | ||
| 24 | +AC_ARG_ENABLE([polkit], | ||
| 25 | + AS_HELP_STRING([--disable-polkit], [Do not use Polkit]), | ||
| 26 | + [enable_polkit="$enableval"], [enable_polkit="yes"]) | ||
| 27 | + | ||
| 28 | +AS_IF([test "x$enable_polkit" = "xyes"], [ | ||
| 29 | PKG_CHECK_MODULES(POLKIT, | ||
| 30 | [polkit-gobject-1], | ||
| 31 | [have_polkit=yes], | ||
| 32 | [have_polkit=no]) | ||
| 33 | + ]) | ||
| 34 | +AM_CONDITIONAL([HAVE_POLKIT], [test "x$enable_polkit" = "xyes"]) | ||
| 35 | + | ||
| 36 | PKG_CHECK_MODULES(SYSTEMD, | ||
| 37 | [libsystemd >= systemd_required_version], | ||
| 38 | [have_systemd=yes], | ||
| 39 | -- | ||
| 40 | 2.4.0 | ||
| 41 | |||
