mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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>
This commit is contained in:
parent
e0f9361751
commit
d085e70eee
|
@ -656,7 +656,6 @@ RECIPE_MAINTAINER_pn-swig = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||||
RECIPE_MAINTAINER_pn-sysfsutils = "Chen Qi <Qi.Chen@windriver.com>"
|
RECIPE_MAINTAINER_pn-sysfsutils = "Chen Qi <Qi.Chen@windriver.com>"
|
||||||
RECIPE_MAINTAINER_pn-sysklogd = "Chen Qi <Qi.Chen@windriver.com>"
|
RECIPE_MAINTAINER_pn-sysklogd = "Chen Qi <Qi.Chen@windriver.com>"
|
||||||
RECIPE_MAINTAINER_pn-syslinux = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
RECIPE_MAINTAINER_pn-syslinux = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
||||||
RECIPE_MAINTAINER_pn-sysprof = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
|
||||||
RECIPE_MAINTAINER_pn-sysstat = "Chen Qi <Qi.Chen@windriver.com>"
|
RECIPE_MAINTAINER_pn-sysstat = "Chen Qi <Qi.Chen@windriver.com>"
|
||||||
RECIPE_MAINTAINER_pn-systemd = "Chen Qi <Qi.Chen@windriver.com>"
|
RECIPE_MAINTAINER_pn-systemd = "Chen Qi <Qi.Chen@windriver.com>"
|
||||||
RECIPE_MAINTAINER_pn-systemd-boot = "Chen Qi <Qi.Chen@windriver.com>"
|
RECIPE_MAINTAINER_pn-systemd-boot = "Chen Qi <Qi.Chen@windriver.com>"
|
||||||
|
|
|
@ -10,7 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||||
|
|
||||||
inherit packagegroup
|
inherit packagegroup
|
||||||
|
|
||||||
PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}"
|
PROFILE_TOOLS_X = ""
|
||||||
# sysprof doesn't support aarch64 and nios2
|
# sysprof doesn't support aarch64 and nios2
|
||||||
PROFILE_TOOLS_X_aarch64 = ""
|
PROFILE_TOOLS_X_aarch64 = ""
|
||||||
PROFILE_TOOLS_X_nios2 = ""
|
PROFILE_TOOLS_X_nios2 = ""
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
||||||
Date: Wed, 23 Aug 2017 18:38:26 +0300
|
|
||||||
Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [oe-core specific]
|
|
||||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
meson.build | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 3986273..ae2f65e 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -164,7 +164,6 @@ subdir('tools')
|
|
||||||
subdir('tests')
|
|
||||||
|
|
||||||
subdir('data')
|
|
||||||
-subdir('help')
|
|
||||||
subdir('po')
|
|
||||||
|
|
||||||
meson.add_install_script('build-aux/meson/post_install.sh')
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
On uclibc elf.h does not have GNU extentions but we need this define
|
|
||||||
so we define it locally if its not getting it from elf.h
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Index: git/elfparser.h
|
|
||||||
===================================================================
|
|
||||||
--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700
|
|
||||||
+++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700
|
|
||||||
@@ -17,6 +17,10 @@
|
|
||||||
*/
|
|
||||||
#include <glib.h>
|
|
||||||
|
|
||||||
+#ifndef NT_GNU_BUILD_ID
|
|
||||||
+#define NT_GNU_BUILD_ID 3
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
typedef struct ElfSym ElfSym;
|
|
||||||
typedef struct ElfParser ElfParser;
|
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
SUMMARY = "System-wide Performance Profiler for Linux"
|
|
||||||
HOMEPAGE = "http://www.sysprof.com"
|
|
||||||
LICENSE = "GPLv3+"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
|
|
||||||
file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
|
|
||||||
|
|
||||||
GNOMEBASEBUILDCLASS = "meson"
|
|
||||||
inherit gnomebase gettext systemd upstream-version-is-even gsettings
|
|
||||||
|
|
||||||
DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
|
|
||||||
|
|
||||||
SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af"
|
|
||||||
SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d"
|
|
||||||
SRC_URI += " \
|
|
||||||
file://define-NT_GNU_BUILD_ID.patch \
|
|
||||||
file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
|
|
||||||
PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
|
|
||||||
PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
|
|
||||||
|
|
||||||
SOLIBS = ".so"
|
|
||||||
FILES_SOLIBSDEV = ""
|
|
||||||
|
|
||||||
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}"
|
|
||||||
|
|
||||||
FILES_${PN} += " \
|
|
||||||
${datadir}/dbus-1/system-services \
|
|
||||||
${datadir}/dbus-1/system.d \
|
|
||||||
${datadir}/metainfo \
|
|
||||||
"
|
|
Loading…
Reference in New Issue
Block a user