summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-09-18 15:16:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-28 23:25:42 +0000
commitd085e70eeedb5f36a0d53f384f333ef2404a48bd (patch)
tree9cdaea9b5206b9f605abb452d0cb59da2f9bbd37
parente0f93617518137f25d8ed4a12fcd386c924285e1 (diff)
downloadpoky-d085e70eeedb5f36a0d53f384f333ef2404a48bd.tar.gz
sysprof: move recipe to meta-oe
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe. (From OE-Core rev: 48332e8d214ace84c54f4924cb05f4b47d030cf7) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb2
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch27
-rw-r--r--meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch22
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_3.32.0.bb32
5 files changed, 1 insertions, 83 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 79404dfbdb..c9c7a8be55 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -656,7 +656,6 @@ RECIPE_MAINTAINER_pn-swig = "Anuj Mittal <anuj.mittal@intel.com>"
656RECIPE_MAINTAINER_pn-sysfsutils = "Chen Qi <Qi.Chen@windriver.com>" 656RECIPE_MAINTAINER_pn-sysfsutils = "Chen Qi <Qi.Chen@windriver.com>"
657RECIPE_MAINTAINER_pn-sysklogd = "Chen Qi <Qi.Chen@windriver.com>" 657RECIPE_MAINTAINER_pn-sysklogd = "Chen Qi <Qi.Chen@windriver.com>"
658RECIPE_MAINTAINER_pn-syslinux = "Alexander Kanavin <alex.kanavin@gmail.com>" 658RECIPE_MAINTAINER_pn-syslinux = "Alexander Kanavin <alex.kanavin@gmail.com>"
659RECIPE_MAINTAINER_pn-sysprof = "Alexander Kanavin <alex.kanavin@gmail.com>"
660RECIPE_MAINTAINER_pn-sysstat = "Chen Qi <Qi.Chen@windriver.com>" 659RECIPE_MAINTAINER_pn-sysstat = "Chen Qi <Qi.Chen@windriver.com>"
661RECIPE_MAINTAINER_pn-systemd = "Chen Qi <Qi.Chen@windriver.com>" 660RECIPE_MAINTAINER_pn-systemd = "Chen Qi <Qi.Chen@windriver.com>"
662RECIPE_MAINTAINER_pn-systemd-boot = "Chen Qi <Qi.Chen@windriver.com>" 661RECIPE_MAINTAINER_pn-systemd-boot = "Chen Qi <Qi.Chen@windriver.com>"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 3fd423c592..984c2fac92 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -10,7 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
10 10
11inherit packagegroup 11inherit packagegroup
12 12
13PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" 13PROFILE_TOOLS_X = ""
14# sysprof doesn't support aarch64 and nios2 14# sysprof doesn't support aarch64 and nios2
15PROFILE_TOOLS_X_aarch64 = "" 15PROFILE_TOOLS_X_aarch64 = ""
16PROFILE_TOOLS_X_nios2 = "" 16PROFILE_TOOLS_X_nios2 = ""
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
deleted file mode 100644
index ade51cf864..0000000000
--- a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From d332b480257aa98b63d39c3c94896a111536f937 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 2/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---
10 meson.build | 1 -
11 1 file changed, 1 deletion(-)
12
13diff --git a/meson.build b/meson.build
14index 3986273..ae2f65e 100644
15--- a/meson.build
16+++ b/meson.build
17@@ -164,7 +164,6 @@ subdir('tools')
18 subdir('tests')
19
20 subdir('data')
21-subdir('help')
22 subdir('po')
23
24 meson.add_install_script('build-aux/meson/post_install.sh')
25--
262.7.4
27
diff --git a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
deleted file mode 100644
index f75ddad43a..0000000000
--- a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1On uclibc elf.h does not have GNU extentions but we need this define
2so we define it locally if its not getting it from elf.h
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Upstream-Status: Pending
7
8Index: git/elfparser.h
9===================================================================
10--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700
11+++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700
12@@ -17,6 +17,10 @@
13 */
14 #include <glib.h>
15
16+#ifndef NT_GNU_BUILD_ID
17+#define NT_GNU_BUILD_ID 3
18+#endif
19+
20 typedef struct ElfSym ElfSym;
21 typedef struct ElfParser ElfParser;
22
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta/recipes-kernel/sysprof/sysprof_3.32.0.bb
deleted file mode 100644
index b92933806c..0000000000
--- a/meta/recipes-kernel/sysprof/sysprof_3.32.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1SUMMARY = "System-wide Performance Profiler for Linux"
2HOMEPAGE = "http://www.sysprof.com"
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
5 file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
6
7GNOMEBASEBUILDCLASS = "meson"
8inherit gnomebase gettext systemd upstream-version-is-even gsettings
9
10DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
11
12SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af"
13SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d"
14SRC_URI += " \
15 file://define-NT_GNU_BUILD_ID.patch \
16 file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
17 "
18
19PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
20PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
21PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
22
23SOLIBS = ".so"
24FILES_SOLIBSDEV = ""
25
26SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}"
27
28FILES_${PN} += " \
29 ${datadir}/dbus-1/system-services \
30 ${datadir}/dbus-1/system.d \
31 ${datadir}/metainfo \
32 "