diff options
Diffstat (limited to 'meta')
4 files changed, 34 insertions, 5 deletions
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb index 563182c89f..9a5e8006c7 100644 --- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb +++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb | |||
@@ -15,7 +15,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | |||
15 | EXTRA_OEMAKE = "\ | 15 | EXTRA_OEMAKE = "\ |
16 | 'prefix=${prefix}' \ | 16 | 'prefix=${prefix}' \ |
17 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ | 17 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ |
18 | 'libdir=${@oe.path.relative(prefix, libdir)}' \ | 18 | 'libdir=${libdir}' \ |
19 | NO_PYTHON=1 \ | 19 | NO_PYTHON=1 \ |
20 | gui \ | 20 | gui \ |
21 | " | 21 | " |
@@ -28,5 +28,6 @@ do_install() { | |||
28 | oe_runmake DESTDIR="${D}" install_gui | 28 | oe_runmake DESTDIR="${D}" install_gui |
29 | rm ${D}${bindir}/trace-cmd | 29 | rm ${D}${bindir}/trace-cmd |
30 | rm -rf ${D}${libdir}/trace-cmd | 30 | rm -rf ${D}${libdir}/trace-cmd |
31 | rm -rf ${D}${sysconfdir}/bash_completion.d/trace-cmd.bash | ||
31 | rmdir ${D}${libdir} | 32 | rmdir ${D}${libdir} |
32 | } | 33 | } |
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc index 3ad06fad81..002ee65fda 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd.inc +++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | SRCREV = "9be5d74805830a291615f2f34a27c903f6a37b1e" | 1 | SRCREV = "021710e1073fe203341b427cd1a4bac577ec899c" |
2 | PV = "2.6" | 2 | PV = "2.6.1" |
3 | 3 | ||
4 | inherit pkgconfig | 4 | inherit pkgconfig |
5 | 5 | ||
@@ -7,6 +7,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:" | |||
7 | 7 | ||
8 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=trace-cmd-stable-v2.6 \ | 8 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=trace-cmd-stable-v2.6 \ |
9 | file://blktrace-api-compatibility.patch \ | 9 | file://blktrace-api-compatibility.patch \ |
10 | file://0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | S = "${WORKDIR}/git" | 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 new file mode 100644 index 0000000000..5763083569 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch | |||
@@ -0,0 +1,27 @@ | |||
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_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb index dd9a8a0ded..fa9ffa3dc8 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | |||
@@ -5,7 +5,7 @@ require trace-cmd.inc | |||
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
7 | file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ | 7 | file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ |
8 | file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ | 8 | file://COPYING.LIB;md5=edb195fe538e4552c1f6ca0fd7bf4f0a \ |
9 | file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \ | 9 | file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \ |
10 | " | 10 | " |
11 | 11 | ||
@@ -17,7 +17,7 @@ EXTRA_OEMAKE = "\ | |||
17 | 'img_install=${datadir}/kernelshark/html/images' \ | 17 | 'img_install=${datadir}/kernelshark/html/images' \ |
18 | \ | 18 | \ |
19 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ | 19 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ |
20 | 'libdir=${@oe.path.relative(prefix, libdir)}' \ | 20 | 'libdir=${libdir}' \ |
21 | \ | 21 | \ |
22 | NO_PYTHON=1 \ | 22 | NO_PYTHON=1 \ |
23 | " | 23 | " |