summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch (renamed from meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch)0
-rw-r--r--meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb18
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd.inc14
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb16
4 files changed, 22 insertions, 26 deletions
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
index faef049fec..faef049fec 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
+++ b/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index d61097df91..e64abe2ecc 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -1,28 +1,18 @@
1SUMMARY = "Graphical trace viewer for Ftrace" 1SUMMARY = "Graphical trace viewer for Ftrace"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3
4require trace-cmd.inc
5
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" 7 file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
5 8
6SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
7PR = "r3"
8PV = "1.2+git${SRCPV}"
9
10DEPENDS = "gtk+" 9DEPENDS = "gtk+"
11RDEPENDS_${PN} = "trace-cmd" 10RDEPENDS_${PN} = "trace-cmd"
12 11
13inherit pkgconfig pythonnative 12SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch"
14
15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
16 file://addldflags.patch \
17 file://make-docs-optional.patch \
18 file://blktrace-api-compatibility.patch \
19 file://kernelshark-fix-syntax-error-of-shell.patch"
20S = "${WORKDIR}/git"
21 13
22EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" 14EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
23 15
24FILESPATH = "${FILE_DIRNAME}/trace-cmd"
25
26do_install() { 16do_install() {
27 oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui 17 oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
28 rm -rf ${D}${datadir}/trace-cmd 18 rm -rf ${D}${datadir}/trace-cmd
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
new file mode 100644
index 0000000000..fb8c5fa7f7
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
@@ -0,0 +1,14 @@
1SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
2PR = "r3"
3PV = "1.2+git${SRCPV}"
4
5inherit pkgconfig pythonnative
6
7FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:"
8
9SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
10 file://addldflags.patch \
11 file://make-docs-optional.patch \
12 file://blktrace-api-compatibility.patch \
13"
14S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
index a0c823bf62..6f3319dfd1 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
@@ -1,26 +1,18 @@
1SUMMARY = "User interface to Ftrace" 1SUMMARY = "User interface to Ftrace"
2LICENSE = "GPLv2 & LGPLv2.1" 2LICENSE = "GPLv2 & LGPLv2.1"
3
4require trace-cmd.inc
5
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ 7 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
5 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ 8 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
6 file://trace-input.c;beginline=5;endine=8;md5=6ad47cc2b03385d8456771eec5eeea0b" 9 file://trace-input.c;beginline=5;endine=8;md5=6ad47cc2b03385d8456771eec5eeea0b"
7 10
8SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" 11SRC_URI_append = "file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
9PR = "r3"
10PV = "1.2+git${SRCPV}"
11
12inherit pkgconfig pythonnative
13
14SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
15 file://addldflags.patch \
16 file://make-docs-optional.patch \
17 file://blktrace-api-compatibility.patch \
18 file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
19 file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \ 12 file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \
20 file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \ 13 file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \
21 file://trace-cmd-fix-syntax-error-of-shell.patch \ 14 file://trace-cmd-fix-syntax-error-of-shell.patch \
22" 15"
23S = "${WORKDIR}/git"
24 16
25EXTRA_OEMAKE = "'prefix=${prefix}'" 17EXTRA_OEMAKE = "'prefix=${prefix}'"
26 18