summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-07-22 09:26:33 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:56:30 +0100
commit6660e95cbf8b467bfb07bce18a7457639081f1d4 (patch)
treed6d27431aadf81dc0c539beecd2f68cb3c1c188b
parent71d0c871c991fc4959fa5b5e7ccbcbf140fa16b3 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch41
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_git.bb8
2 files changed, 47 insertions, 2 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 @@
1From 2b4005d72d3393933a7914be102ea65505c536cc Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Thu, 21 Jul 2016 11:53:31 +0300
4Subject: [PATCH] configure: Add option to enable/disable polkit
5
6Changes the configure behaviour from autodetecting the polkit by default
7to having an option to disable it explicitly
8
9Upstream-Status: Pending
10
11Signed-off-by: Maxin B. John <maxin.john@intel.com>
12---
13 configure.ac | 8 ++++++++
14 1 file changed, 8 insertions(+)
15
16diff --git a/configure.ac b/configure.ac
17index 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--
402.4.0
41
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 2b0fbec732..6324d20f65 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv3+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" 4 file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
5 5
6inherit gnomebase gettext 6inherit gnomebase gettext systemd
7 7
8DEPENDS = "glib-2.0" 8DEPENDS = "glib-2.0"
9 9
@@ -13,6 +13,7 @@ PV = "3.20.0+git${SRCPV}"
13 13
14SRC_URI = "git://git.gnome.org/sysprof \ 14SRC_URI = "git://git.gnome.org/sysprof \
15 file://define-NT_GNU_BUILD_ID.patch \ 15 file://define-NT_GNU_BUILD_ID.patch \
16 file://0001-configure-Add-option-to-enable-disable-polkit.patch \
16 file://0001-Disable-check-for-polkit-for-UI.patch \ 17 file://0001-Disable-check-for-polkit-for-UI.patch \
17 file://0001-Avoid-building-docs.patch \ 18 file://0001-Avoid-building-docs.patch \
18 file://0001-callgraph-Use-U64_TO_POINTER.patch \ 19 file://0001-callgraph-Use-U64_TO_POINTER.patch \
@@ -27,9 +28,12 @@ EXTRA_OECONF = "--enable-compile-warnings"
27 28
28PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" 29PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
29PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" 30PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
31PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus"
30 32
31FILES_${PN} += "${datadir}/icons/ ${libdir}/libsysprof*" 33FILES_${PN} += "${datadir}/icons/ ${libdir}/libsysprof* ${datadir}/dbus-1/"
32FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" 34FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
33 35
36SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}"
37
34# We do not yet work for aarch64. 38# We do not yet work for aarch64.
35COMPATIBLE_HOST = "^(?!aarch64).*" 39COMPATIBLE_HOST = "^(?!aarch64).*"