diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-09-18 15:16:21 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-28 23:25:42 +0000 |
| commit | d085e70eeedb5f36a0d53f384f333ef2404a48bd (patch) | |
| tree | 9cdaea9b5206b9f605abb452d0cb59da2f9bbd37 /meta/recipes-kernel | |
| parent | e0f93617518137f25d8ed4a12fcd386c924285e1 (diff) | |
| download | poky-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>
Diffstat (limited to 'meta/recipes-kernel')
3 files changed, 0 insertions, 81 deletions
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 @@ | |||
| 1 | From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Wed, 23 Aug 2017 18:38:26 +0300 | ||
| 4 | Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 8 | |||
| 9 | --- | ||
| 10 | meson.build | 1 - | ||
| 11 | 1 file changed, 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/meson.build b/meson.build | ||
| 14 | index 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 | -- | ||
| 26 | 2.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 @@ | |||
| 1 | On uclibc elf.h does not have GNU extentions but we need this define | ||
| 2 | so we define it locally if its not getting it from elf.h | ||
| 3 | |||
| 4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Index: 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 @@ | |||
| 1 | SUMMARY = "System-wide Performance Profiler for Linux" | ||
| 2 | HOMEPAGE = "http://www.sysprof.com" | ||
| 3 | LICENSE = "GPLv3+" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | ||
| 5 | file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" | ||
| 6 | |||
| 7 | GNOMEBASEBUILDCLASS = "meson" | ||
| 8 | inherit gnomebase gettext systemd upstream-version-is-even gsettings | ||
| 9 | |||
| 10 | DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" | ||
| 11 | |||
| 12 | SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" | ||
| 13 | SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" | ||
| 14 | SRC_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 | |||
| 19 | PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" | ||
| 20 | PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" | ||
| 21 | PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" | ||
| 22 | |||
| 23 | SOLIBS = ".so" | ||
| 24 | FILES_SOLIBSDEV = "" | ||
| 25 | |||
| 26 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" | ||
| 27 | |||
| 28 | FILES_${PN} += " \ | ||
| 29 | ${datadir}/dbus-1/system-services \ | ||
| 30 | ${datadir}/dbus-1/system.d \ | ||
| 31 | ${datadir}/metainfo \ | ||
| 32 | " | ||
