From bcdaa93dc70411da8876364ae67d0bf2456a3611 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 14 Jun 2018 14:31:08 +0100 Subject: trace-cmd: remove Perf is superior in most ways and is preferred. Signed-off-by: Ross Burton --- meta/conf/distro/include/distro_alias.inc | 2 -- meta/conf/distro/include/maintainers.inc | 2 -- .../packagegroup-core-tools-profile.bb | 1 - meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 33 ------------------- meta/recipes-kernel/trace-cmd/trace-cmd.inc | 13 -------- ...its.h-so-that-PATH_MAX-is-defined-an-issu.patch | 27 ---------------- .../trace-cmd/blktrace-api-compatibility.patch | 29 ----------------- meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 37 ---------------------- 8 files changed, 144 deletions(-) delete mode 100644 meta/recipes-kernel/trace-cmd/kernelshark_git.bb delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd_git.bb diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 27533fbae4..68b731ab2b 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -141,7 +141,6 @@ DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandravia=initscripts" DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" -DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark" DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver" DISTRO_PN_ALIAS_pn-keymaps = "OE-Core" DISTRO_PN_ALIAS_pn-kf = "OSPDT" @@ -356,7 +355,6 @@ DISTRO_PN_ALIAS_pn-tar-replacement = "Fedora=tar Ubuntu=tar" DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" DISTRO_PN_ALIAS_pn-texinfo-dummy-native = "OE-Core" DISTRO_PN_ALIAS_pn-tiny-init = "OSPDT" -DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd" DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/" DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 1d3e0590df..97e2d19d55 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -282,7 +282,6 @@ RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao " RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kconfig-frontends = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield " -RECIPE_MAINTAINER_pn-kernelshark = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield " RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster " RECIPE_MAINTAINER_pn-keymaps = "Alexander Kanavin " @@ -677,7 +676,6 @@ RECIPE_MAINTAINER_pn-texinfo-dummy-native = "Maxin B. John -Date: Wed, 14 Jun 2017 15:56:18 +0300 -Subject: [PATCH] Include limits.h so that PATH_MAX is defined (an issue on - musl). - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - trace-listen.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/trace-listen.c b/trace-listen.c -index 17ff9d8..838d6bc 100644 ---- a/trace-listen.c -+++ b/trace-listen.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "trace-local.h" - #include "trace-msg.h" --- -2.11.0 - 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 @@ -trace-cmd: Add blktrace_api compatibility for TC_BARRIER - -Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd -can build regardless of the linux-kernel-headers version. - -Upstream-Status: Inappropriate [Stop gap] - -Signed-off-by: Darren Hart - -diff --git a/plugin_blk.c b/plugin_blk.c -index 9327b17..c8e5e1c 100644 ---- a/plugin_blk.c -+++ b/plugin_blk.c -@@ -44,6 +44,15 @@ struct blk_data { - unsigned short pdu_len; - }; - -+/* -+ * Newer kernels don't define BLK_TC_BARRIER and have replaced it with -+ * BLK_TC_FLUSH. In this case, define it here and report FLUSHES as BARRIERS as -+ * a workaround, as described in: -+ * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=c09c47caedc9854d59378d6e34c989e51cfdd2b4 -+ */ -+#ifndef BLK_TC_BARRIER -+#define BLK_TC_BARRIER 1<<2 -+#endif - static void fill_rwbs(char *rwbs, int action, unsigned int bytes) - { - 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 @@ -SUMMARY = "User interface to Ftrace" -HOMEPAGE = "http://git.kernel.org/" -LICENSE = "GPLv2 & LGPLv2.1" - -require trace-cmd.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ - file://COPYING.LIB;md5=edb195fe538e4552c1f6ca0fd7bf4f0a \ - file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \ -" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[audit] = ',NO_AUDIT=1,audit' -EXTRA_OEMAKE = "\ - 'prefix=${prefix}' \ - 'bindir=${bindir}' \ - 'man_dir=${mandir}' \ - 'html_install=${datadir}/kernelshark/html' \ - 'img_install=${datadir}/kernelshark/html/images' \ - \ - 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ - 'libdir=${libdir}' \ - \ - NO_PYTHON=1 \ - ${PACKAGECONFIG_CONFARGS} \ -" - -do_compile_prepend() { - # Make sure the recompile is OK - rm -f ${B}/.*.d -} - -do_install() { - oe_runmake DESTDIR="${D}" install -} - -- cgit 1.2.3-korg