summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_alias.inc2
-rw-r--r--meta/conf/distro/include/maintainers.inc2
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb1
-rw-r--r--meta/recipes-kernel/trace-cmd/kernelshark_git.bb33
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd.inc13
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch27
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch29
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd_git.bb37
8 files changed, 0 insertions, 144 deletions
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"
141DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" 141DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT"
142DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" 142DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62"
143DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" 143DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux"
144DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark"
145DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver" 144DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver"
146DISTRO_PN_ALIAS_pn-keymaps = "OE-Core" 145DISTRO_PN_ALIAS_pn-keymaps = "OE-Core"
147DISTRO_PN_ALIAS_pn-kf = "OSPDT" 146DISTRO_PN_ALIAS_pn-kf = "OSPDT"
@@ -356,7 +355,6 @@ DISTRO_PN_ALIAS_pn-tar-replacement = "Fedora=tar Ubuntu=tar"
356DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" 355DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/"
357DISTRO_PN_ALIAS_pn-texinfo-dummy-native = "OE-Core" 356DISTRO_PN_ALIAS_pn-texinfo-dummy-native = "OE-Core"
358DISTRO_PN_ALIAS_pn-tiny-init = "OSPDT" 357DISTRO_PN_ALIAS_pn-tiny-init = "OSPDT"
359DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd"
360DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/" 358DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/"
361DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" 359DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera"
362DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" 360DISTRO_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 <yi.zhao@windriver.com>"
282RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin <alex.kanavin@gmail.com>" 282RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin <alex.kanavin@gmail.com>"
283RECIPE_MAINTAINER_pn-kconfig-frontends = "Alexander Kanavin <alex.kanavin@gmail.com>" 283RECIPE_MAINTAINER_pn-kconfig-frontends = "Alexander Kanavin <alex.kanavin@gmail.com>"
284RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <bruce.ashfield@windriver.com>" 284RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <bruce.ashfield@windriver.com>"
285RECIPE_MAINTAINER_pn-kernelshark = "Alexander Kanavin <alex.kanavin@gmail.com>"
286RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield <bruce.ashfield@windriver.com>" 285RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield <bruce.ashfield@windriver.com>"
287RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster <akuster808@gmail.com>" 286RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster <akuster808@gmail.com>"
288RECIPE_MAINTAINER_pn-keymaps = "Alexander Kanavin <alex.kanavin@gmail.com>" 287RECIPE_MAINTAINER_pn-keymaps = "Alexander Kanavin <alex.kanavin@gmail.com>"
@@ -677,7 +676,6 @@ RECIPE_MAINTAINER_pn-texinfo-dummy-native = "Maxin B. John <maxin.john@intel.com
677RECIPE_MAINTAINER_pn-tiff = "Alexander Kanavin <alex.kanavin@gmail.com>" 676RECIPE_MAINTAINER_pn-tiff = "Alexander Kanavin <alex.kanavin@gmail.com>"
678RECIPE_MAINTAINER_pn-time = "Robert Yang <liezhi.yang@windriver.com>" 677RECIPE_MAINTAINER_pn-time = "Robert Yang <liezhi.yang@windriver.com>"
679RECIPE_MAINTAINER_pn-tiny-init = "Alexander Kanavin <alex.kanavin@gmail.com>" 678RECIPE_MAINTAINER_pn-tiny-init = "Alexander Kanavin <alex.kanavin@gmail.com>"
680RECIPE_MAINTAINER_pn-trace-cmd = "Alexander Kanavin <alex.kanavin@gmail.com>"
681RECIPE_MAINTAINER_pn-ttf-bitstream-vera = "Maxin B. John <maxin.john@intel.com>" 679RECIPE_MAINTAINER_pn-ttf-bitstream-vera = "Maxin B. John <maxin.john@intel.com>"
682RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <akuster808@gmail.com>" 680RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <akuster808@gmail.com>"
683RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <akuster808@gmail.com>" 681RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <akuster808@gmail.com>"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index fa0e363d86..5d2b4c8181 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -18,7 +18,6 @@ PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'sys
18 18
19RRECOMMENDS_${PN} = "\ 19RRECOMMENDS_${PN} = "\
20 ${PERF} \ 20 ${PERF} \
21 trace-cmd \
22 blktrace \ 21 blktrace \
23 ${PROFILE_TOOLS_X} \ 22 ${PROFILE_TOOLS_X} \
24 ${PROFILE_TOOLS_SYSTEMD} \ 23 ${PROFILE_TOOLS_SYSTEMD} \
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 @@
1SUMMARY = "Graphical trace viewer for Ftrace"
2LICENSE = "GPLv2"
3
4require trace-cmd.inc
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
7 file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
8
9DEPENDS = "gtk+ libxml2"
10RDEPENDS_${PN} = "trace-cmd"
11
12inherit distro_features_check
13ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
14
15EXTRA_OEMAKE = "\
16 'prefix=${prefix}' \
17 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
18 'libdir=${libdir}' \
19 NO_PYTHON=1 \
20 gui \
21"
22do_configure_prepend() {
23 # Make sure the recompile is OK
24 rm -f ${B}/.*.d
25}
26
27do_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 @@
1SRCREV = "7d0147bbba3ed1d5ef6eea4eec3f0ad4c98f02b5"
2PV = "2.7"
3
4inherit pkgconfig
5
6FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:"
7
8SRC_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
13S = "${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 @@
1From 9488f92c1d0c7931c3e17950d1f9eea2aeb3e2bd Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 14 Jun 2017 15:56:18 +0300
4Subject: [PATCH] Include limits.h so that PATH_MAX is defined (an issue on
5 musl).
6
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 trace-listen.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/trace-listen.c b/trace-listen.c
14index 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--
262.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 @@
1trace-cmd: Add blktrace_api compatibility for TC_BARRIER
2
3Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd
4can build regardless of the linux-kernel-headers version.
5
6Upstream-Status: Inappropriate [Stop gap]
7
8Signed-off-by: Darren Hart <dvhart@linux.intel.com>
9
10diff --git a/plugin_blk.c b/plugin_blk.c
11index 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 @@
1SUMMARY = "User interface to Ftrace"
2HOMEPAGE = "http://git.kernel.org/"
3LICENSE = "GPLv2 & LGPLv2.1"
4
5require trace-cmd.inc
6
7LIC_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
13PACKAGECONFIG ??= ""
14PACKAGECONFIG[audit] = ',NO_AUDIT=1,audit'
15EXTRA_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
29do_compile_prepend() {
30 # Make sure the recompile is OK
31 rm -f ${B}/.*.d
32}
33
34do_install() {
35 oe_runmake DESTDIR="${D}" install
36}
37