diff options
author | Ross Burton <ross.burton@intel.com> | 2018-06-14 14:31:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-27 13:55:21 +0100 |
commit | faa46ac06bf1624d0120f1fcfb00b5ad31948b44 (patch) | |
tree | e00aebb8850ba3fa24e0ebcea95d4a2535acb93d /meta/recipes-kernel | |
parent | bfd866d47f5e8ccf5ef37e0c5e63d3017cd69552 (diff) | |
download | poky-faa46ac06bf1624d0120f1fcfb00b5ad31948b44.tar.gz |
trace-cmd: remove
Perf is superior in most ways and is preferred.
(From OE-Core rev: bcdaa93dc70411da8876364ae67d0bf2456a3611)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
5 files changed, 0 insertions, 139 deletions
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb deleted file mode 100644 index 9a5e8006c7..0000000000 --- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | SUMMARY = "Graphical trace viewer for Ftrace" | ||
2 | LICENSE = "GPLv2" | ||
3 | |||
4 | require trace-cmd.inc | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | ||
7 | file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" | ||
8 | |||
9 | DEPENDS = "gtk+ libxml2" | ||
10 | RDEPENDS_${PN} = "trace-cmd" | ||
11 | |||
12 | inherit distro_features_check | ||
13 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
14 | |||
15 | EXTRA_OEMAKE = "\ | ||
16 | 'prefix=${prefix}' \ | ||
17 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ | ||
18 | 'libdir=${libdir}' \ | ||
19 | NO_PYTHON=1 \ | ||
20 | gui \ | ||
21 | " | ||
22 | do_configure_prepend() { | ||
23 | # Make sure the recompile is OK | ||
24 | rm -f ${B}/.*.d | ||
25 | } | ||
26 | |||
27 | do_install() { | ||
28 | oe_runmake DESTDIR="${D}" install_gui | ||
29 | rm ${D}${bindir}/trace-cmd | ||
30 | rm -rf ${D}${libdir}/trace-cmd | ||
31 | rm -rf ${D}${sysconfdir}/bash_completion.d/trace-cmd.bash | ||
32 | rmdir ${D}${libdir} | ||
33 | } | ||
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc deleted file mode 100644 index 0a1789c459..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd.inc +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | SRCREV = "7d0147bbba3ed1d5ef6eea4eec3f0ad4c98f02b5" | ||
2 | PV = "2.7" | ||
3 | |||
4 | inherit pkgconfig | ||
5 | |||
6 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:" | ||
7 | |||
8 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \ | ||
9 | file://blktrace-api-compatibility.patch \ | ||
10 | file://0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch \ | ||
11 | " | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch deleted file mode 100644 index 5763083569..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 9488f92c1d0c7931c3e17950d1f9eea2aeb3e2bd Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 14 Jun 2017 15:56:18 +0300 | ||
4 | Subject: [PATCH] Include limits.h so that PATH_MAX is defined (an issue on | ||
5 | musl). | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | trace-listen.c | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/trace-listen.c b/trace-listen.c | ||
14 | index 17ff9d8..838d6bc 100644 | ||
15 | --- a/trace-listen.c | ||
16 | +++ b/trace-listen.c | ||
17 | @@ -31,6 +31,7 @@ | ||
18 | #include <fcntl.h> | ||
19 | #include <signal.h> | ||
20 | #include <errno.h> | ||
21 | +#include <limits.h> | ||
22 | |||
23 | #include "trace-local.h" | ||
24 | #include "trace-msg.h" | ||
25 | -- | ||
26 | 2.11.0 | ||
27 | |||
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch deleted file mode 100644 index 320db6a321..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | trace-cmd: Add blktrace_api compatibility for TC_BARRIER | ||
2 | |||
3 | Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd | ||
4 | can build regardless of the linux-kernel-headers version. | ||
5 | |||
6 | Upstream-Status: Inappropriate [Stop gap] | ||
7 | |||
8 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | ||
9 | |||
10 | diff --git a/plugin_blk.c b/plugin_blk.c | ||
11 | index 9327b17..c8e5e1c 100644 | ||
12 | --- a/plugin_blk.c | ||
13 | +++ b/plugin_blk.c | ||
14 | @@ -44,6 +44,15 @@ struct blk_data { | ||
15 | unsigned short pdu_len; | ||
16 | }; | ||
17 | |||
18 | +/* | ||
19 | + * Newer kernels don't define BLK_TC_BARRIER and have replaced it with | ||
20 | + * BLK_TC_FLUSH. In this case, define it here and report FLUSHES as BARRIERS as | ||
21 | + * a workaround, as described in: | ||
22 | + * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=c09c47caedc9854d59378d6e34c989e51cfdd2b4 | ||
23 | + */ | ||
24 | +#ifndef BLK_TC_BARRIER | ||
25 | +#define BLK_TC_BARRIER 1<<2 | ||
26 | +#endif | ||
27 | static void fill_rwbs(char *rwbs, int action, unsigned int bytes) | ||
28 | { | ||
29 | int i = 0; | ||
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb deleted file mode 100644 index d9cc9a7f41..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | SUMMARY = "User interface to Ftrace" | ||
2 | HOMEPAGE = "http://git.kernel.org/" | ||
3 | LICENSE = "GPLv2 & LGPLv2.1" | ||
4 | |||
5 | require trace-cmd.inc | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | ||
8 | file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ | ||
9 | file://COPYING.LIB;md5=edb195fe538e4552c1f6ca0fd7bf4f0a \ | ||
10 | file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \ | ||
11 | " | ||
12 | |||
13 | PACKAGECONFIG ??= "" | ||
14 | PACKAGECONFIG[audit] = ',NO_AUDIT=1,audit' | ||
15 | EXTRA_OEMAKE = "\ | ||
16 | 'prefix=${prefix}' \ | ||
17 | 'bindir=${bindir}' \ | ||
18 | 'man_dir=${mandir}' \ | ||
19 | 'html_install=${datadir}/kernelshark/html' \ | ||
20 | 'img_install=${datadir}/kernelshark/html/images' \ | ||
21 | \ | ||
22 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ | ||
23 | 'libdir=${libdir}' \ | ||
24 | \ | ||
25 | NO_PYTHON=1 \ | ||
26 | ${PACKAGECONFIG_CONFARGS} \ | ||
27 | " | ||
28 | |||
29 | do_compile_prepend() { | ||
30 | # Make sure the recompile is OK | ||
31 | rm -f ${B}/.*.d | ||
32 | } | ||
33 | |||
34 | do_install() { | ||
35 | oe_runmake DESTDIR="${D}" install | ||
36 | } | ||
37 | |||