kernelshark: Update to version 2.5.3

Update to version 2.5.3 to match trace-cmd.

Changes include:

 - Remove kernelshark-fix-syntax-error-of-shell.patch (the syntax error
   is no longer present in the new version).

 - Specify bindir_relative and libdir in EXTRA_OEMAKE as in the
   trace-cmd recipe so files get installed to the right place.
   Additionally, remove unnecessary EXTRA_OEMAKE options.

 - Fix up the do_install steps to remove the plugins directory; that
   directory now lives under /usr/lib.

 - Set NO_PYTHON=1 because building the ctracecmd Python module requires
   swig, which is not available in oe-core.

(From OE-Core rev: 2f177644dab083bc5306bce1bf2ff2ef8851c862)

Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ben Shelton
2015-02-19 14:11:06 -06:00
committed by Richard Purdie
parent 6dc2030dcf
commit e0a55a90bb
2 changed files with 11 additions and 37 deletions

View File

@@ -1,30 +0,0 @@
kernelshark: fix syntax error of shell
Delete "<<<" syntax of bash in Makefile, else we would get following error:
Syntax error: redirection unexpected
Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index c1fa906..be84415 100644
--- a/Makefile
+++ b/Makefile
@@ -89,8 +89,7 @@ endif
# $(call test-build, snippet, ret) -> ret if snippet compiles
# -> empty otherwise
-test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \
- <<<'$1' && echo y), $2)
+test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2)
# have udis86 disassembler library?
udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
--
1.7.9.5

View File

@@ -9,9 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
DEPENDS = "gtk+ libxml2"
RDEPENDS_${PN} = "trace-cmd"
SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch"
EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
EXTRA_OEMAKE = "\
'prefix=${prefix}' \
'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
'libdir=${@oe.path.relative(prefix, libdir)}' \
NO_PYTHON=1 \
gui \
"
do_compile_prepend() {
# Make sure the recompile is OK
@@ -19,8 +23,8 @@ do_compile_prepend() {
}
do_install() {
oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
rm ${D}${bindir}/trace-cmd
rm -rf ${D}${datadir}/trace-cmd
rmdir ${D}${datadir}
oe_runmake DESTDIR="${D}" install_gui
rm ${D}${bindir}/trace-cmd
rm -rf ${D}${libdir}/trace-cmd
rmdir ${D}${libdir}
}