From 83c8cecf908084d418c1ca538706539a5fd96189 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 8 May 2017 16:39:46 +0300 Subject: trace-cmd: update to 2.6.1 License change is due to update in FSF address. Library path needs to be specified in absolute form now. Remove bash completion file from kernelshark package as it will cause a conflict with trace-cmd package. Add a patch to resolve musl build issues. (From OE-Core rev: 9f07921c6dcb2ea0abeaf1943aa2de5d81c82c0f) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 3 ++- meta/recipes-kernel/trace-cmd/trace-cmd.inc | 5 ++-- ...its.h-so-that-PATH_MAX-is-defined-an-issu.patch | 27 ++++++++++++++++++++++ meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 4 ++-- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch (limited to 'meta/recipes-kernel/trace-cmd') 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}" EXTRA_OEMAKE = "\ 'prefix=${prefix}' \ 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ - 'libdir=${@oe.path.relative(prefix, libdir)}' \ + 'libdir=${libdir}' \ NO_PYTHON=1 \ gui \ " @@ -28,5 +28,6 @@ do_install() { oe_runmake DESTDIR="${D}" install_gui rm ${D}${bindir}/trace-cmd rm -rf ${D}${libdir}/trace-cmd + rm -rf ${D}${sysconfdir}/bash_completion.d/trace-cmd.bash rmdir ${D}${libdir} } 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 @@ -SRCREV = "9be5d74805830a291615f2f34a27c903f6a37b1e" -PV = "2.6" +SRCREV = "021710e1073fe203341b427cd1a4bac577ec899c" +PV = "2.6.1" inherit pkgconfig @@ -7,6 +7,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=trace-cmd-stable-v2.6 \ file://blktrace-api-compatibility.patch \ + file://0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch \ " 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 @@ +From 9488f92c1d0c7931c3e17950d1f9eea2aeb3e2bd Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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_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 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ - file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ + file://COPYING.LIB;md5=edb195fe538e4552c1f6ca0fd7bf4f0a \ file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \ " @@ -17,7 +17,7 @@ EXTRA_OEMAKE = "\ 'img_install=${datadir}/kernelshark/html/images' \ \ 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ - 'libdir=${@oe.path.relative(prefix, libdir)}' \ + 'libdir=${libdir}' \ \ NO_PYTHON=1 \ " -- cgit v1.2.3-54-g00ecf