summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-04 15:12:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-05 12:02:37 +0000
commit651a82f26b6143af49ecf3e54671159fe15efe99 (patch)
treedd1cb827a3ccd8b9224648830a760703e43dc1f0
parentb040f4fbc2de43572ec70c1d38076267bb17f076 (diff)
downloadpoky-651a82f26b6143af49ecf3e54671159fe15efe99.tar.gz
sysprof: convert to meson build
Drop autotools-specific patches. Rename polkit packageconfig option to sysprofd as 'polkit' does not at all match what is happening. Remove --enable-compiler-warnings, as the equivalent in meson could not be found. (From OE-Core rev: 2c2684c8338bf4bb9f08951a3fdd0ee194a88db4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch42
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch32
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch26
-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_3.26.1.bb22
5 files changed, 37 insertions, 126 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch b/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
deleted file mode 100644
index 202f354d29..0000000000
--- a/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 27df521c68e7c8b5b050dab15f40aa15fd03623a Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 4 May 2016 14:58:24 +0300
4Subject: [PATCH] Avoid building docs
5
6Upstream-Status: Inappropriate
7Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
8---
9 Makefile.am | 2 +-
10 m4/yelp.m4 | 6 ------
11 2 files changed, 1 insertion(+), 7 deletions(-)
12
13diff --git a/Makefile.am b/Makefile.am
14index b919a3f..3a3851d 100644
15--- a/Makefile.am
16+++ b/Makefile.am
17@@ -1,4 +1,4 @@
18-SUBDIRS = daemon data help lib po src tools tests
19+SUBDIRS = daemon data lib po src tools tests
20
21 EXTRA_DIST = AUTHORS tap-test COPYING.gpl-2
22
23diff --git a/m4/yelp.m4 b/m4/yelp.m4
24index 5db847f..1b6ede4 100644
25--- a/m4/yelp.m4
26+++ b/m4/yelp.m4
27@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir],
28 HELP_DIR="$with_help_dir"
29 AC_SUBST(HELP_DIR)
30
31-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
32-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
33-if test x"$ITSTOOL" = x; then
34- AC_MSG_ERROR([itstool not found])
35-fi
36-
37 AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
38 AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
39 if test x"$XMLLINT" = x; then
40--
412.1.4
42
diff --git a/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch b/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
deleted file mode 100644
index 608523272a..0000000000
--- a/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 765d578145e31ddc9495adfab8037ade33c6a9cc Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 4 May 2016 10:59:36 +0300
4Subject: [PATCH] Disable check for polkit for UI
5
6The check is not technically required: sysprof just needs
7to be able to access system perf counters at runtime.
8
9Upstream-Status: Pending
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11---
12 configure.ac | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 8559597..ecf93ad 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -131,8 +131,8 @@ AS_IF([test "$enable_gtk" = auto],[
20 AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[enable_gtk=yes],[enable_gtk=no])
21 ])
22 AS_IF([test "$enable_gtk" = "yes"],[
23- AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[],[
24- AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version and polkit-gobject-1])
25+ AS_IF([test "$have_gtk" = "yes"],[],[
26+ AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version])
27 ])
28 ])
29 AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" = "yes")
30--
312.8.1
32
diff --git a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
new file mode 100644
index 0000000000..e28fdcad94
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
@@ -0,0 +1,26 @@
1From c2495a4c042e6a675da69bab20cc3669391e8e2a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 23 Aug 2017 18:38:26 +0300
4Subject: [PATCH 1/2] Do not build anything in help/ as it requires itstool.
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 meson.build | 1 -
10 1 file changed, 1 deletion(-)
11
12diff --git a/meson.build b/meson.build
13index 4ac3934..8c4369a 100644
14--- a/meson.build
15+++ b/meson.build
16@@ -116,7 +116,6 @@ subdir('tools')
17 subdir('tests')
18
19 subdir('data')
20-subdir('help')
21 subdir('po')
22
23 meson.add_install_script('build-aux/meson_post_install.sh')
24--
252.14.1
26
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
deleted file mode 100644
index 158d9975f2..0000000000
--- a/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
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_3.26.1.bb b/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
index dbce3d7439..1989b52a77 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
@@ -4,6 +4,7 @@ LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
5 file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" 5 file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
6 6
7GNOMEBASEBUILDCLASS = "meson"
7inherit gnomebase gettext systemd upstream-version-is-even 8inherit gnomebase gettext systemd upstream-version-is-even
8 9
9DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" 10DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
@@ -12,23 +13,22 @@ SRC_URI[archive.md5sum] = "6f9f947960ba79bb1269d8ee49b7db78"
12SRC_URI[archive.sha256sum] = "d8b9d5c2246696e4a3776a312731dc7c014fbd33478bb14d5512c6f1f35a3b11" 13SRC_URI[archive.sha256sum] = "d8b9d5c2246696e4a3776a312731dc7c014fbd33478bb14d5512c6f1f35a3b11"
13SRC_URI += " \ 14SRC_URI += " \
14 file://define-NT_GNU_BUILD_ID.patch \ 15 file://define-NT_GNU_BUILD_ID.patch \
15 file://0001-configure-Add-option-to-enable-disable-polkit.patch \ 16 file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
16 file://0001-Disable-check-for-polkit-for-UI.patch \ 17 "
17 file://0001-Avoid-building-docs.patch \
18 "
19
20AUTOTOOLS_AUXDIR = "${S}/build-aux"
21
22EXTRA_OECONF = "--enable-compile-warnings"
23 18
24PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" 19PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
25PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" 20PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
26PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus" 21PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
27 22
28SOLIBS = ".so" 23SOLIBS = ".so"
29FILES_SOLIBSDEV = "" 24FILES_SOLIBSDEV = ""
30 25
31SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}" 26SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}"
32 27
33# We do not yet work for aarch64. 28# We do not yet work for aarch64.
34COMPATIBLE_HOST = "^(?!aarch64).*" 29COMPATIBLE_HOST = "^(?!aarch64).*"
30
31FILES_${PN} += " \
32 ${datadir}/dbus-1/system-services \
33 ${datadir}/dbus-1/system.d \
34 "