<div dir="ltr">Hi Ben,<div><br></div><div>This is failing on the autobuilder:</div><div><br></div><div><a href="http://errors.yoctoproject.org/Errors/Details/8571/">http://errors.yoctoproject.org/Errors/Details/8571/</a><br></div><div><a href="http://errors.yoctoproject.org/Errors/Details/8572/">http://errors.yoctoproject.org/Errors/Details/8572/</a><br></div><div><br></div><div>Two problems - an exception during build that is probably being ignored, and then swing not found. Is swig a non-deterministic dependency?</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 9 February 2015 at 16:52, Ben Shelton <span dir="ltr"><<a href="mailto:ben.shelton@ni.com" target="_blank">ben.shelton@ni.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Update to version 2.5.2 to match trace-cmd.<br>
<br>
Changes include:<br>
<br>
- Remove kernelshark-fix-syntax-error-of-shell.patch (the syntax error<br>
is no longer present in the new version).<br>
<br>
- Specify bindir_relative and libdir in EXTRA_OEMAKE as in the<br>
trace-cmd recipe so files get installed to the right place.<br>
Additionally, remove unnecessary EXTRA_OEMAKE options.<br>
<br>
- Fix up the do_install steps to remove the plugins directory; that<br>
directory now lives under /usr/lib.<br>
<br>
Signed-off-by: Ben Shelton <<a href="mailto:ben.shelton@ni.com">ben.shelton@ni.com</a>><br>
---<br>
.../kernelshark-fix-syntax-error-of-shell.patch | 30 ----------------------<br>
.../{<a href="http://kernelshark_1.2.bb" target="_blank">kernelshark_1.2.bb</a> => <a href="http://kernelshark_git.bb" target="_blank">kernelshark_git.bb</a>} | 17 +++++++-----<br>
2 files changed, 10 insertions(+), 37 deletions(-)<br>
delete mode 100644 meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch<br>
rename meta/recipes-kernel/trace-cmd/{<a href="http://kernelshark_1.2.bb" target="_blank">kernelshark_1.2.bb</a> => <a href="http://kernelshark_git.bb" target="_blank">kernelshark_git.bb</a>} (58%)<br>
<br>
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch<br>
deleted file mode 100644<br>
index faef049..0000000<br>
--- a/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch<br>
+++ /dev/null<br>
@@ -1,30 +0,0 @@<br>
-kernelshark: fix syntax error of shell<br>
-<br>
-Delete "<<<" syntax of bash in Makefile, else we would get following error:<br>
-<br>
- Syntax error: redirection unexpected<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Chong Lu <<a href="mailto:Chong.Lu@windriver.com">Chong.Lu@windriver.com</a>><br>
----<br>
- Makefile | 3 +--<br>
- 1 file changed, 1 insertion(+), 2 deletions(-)<br>
-<br>
-diff --git a/Makefile b/Makefile<br>
-index c1fa906..be84415 100644<br>
---- a/Makefile<br>
-+++ b/Makefile<br>
-@@ -89,8 +89,7 @@ endif<br>
-<br>
- # $(call test-build, snippet, ret) -> ret if snippet compiles<br>
- # -> empty otherwise<br>
--test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \<br>
-- <<<'$1' && echo y), $2)<br>
-+test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2)<br>
-<br>
- # have udis86 disassembler library?<br>
- udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-kernel/trace-cmd/<a href="http://kernelshark_1.2.bb" target="_blank">kernelshark_1.2.bb</a> b/meta/recipes-kernel/trace-cmd/<a href="http://kernelshark_git.bb" target="_blank">kernelshark_git.bb</a><br>
similarity index 58%<br>
rename from meta/recipes-kernel/trace-cmd/<a href="http://kernelshark_1.2.bb" target="_blank">kernelshark_1.2.bb</a><br>
rename to meta/recipes-kernel/trace-cmd/<a href="http://kernelshark_git.bb" target="_blank">kernelshark_git.bb</a><br>
index 28412c7..814e8bf 100644<br>
--- a/meta/recipes-kernel/trace-cmd/<a href="http://kernelshark_1.2.bb" target="_blank">kernelshark_1.2.bb</a><br>
+++ b/meta/recipes-kernel/trace-cmd/<a href="http://kernelshark_git.bb" target="_blank">kernelshark_git.bb</a><br>
@@ -9,9 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \<br>
DEPENDS = "gtk+ libxml2"<br>
RDEPENDS_${PN} = "trace-cmd"<br>
<br>
-SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch"<br>
-<br>
-EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"<br>
+EXTRA_OEMAKE = "\<br>
+ 'prefix=${prefix}' \<br>
+ 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \<br>
+ 'libdir=${@oe.path.relative(prefix, libdir)}' \<br>
+ gui \<br>
+"<br>
<br>
do_compile_prepend() {<br>
# Make sure the recompile is OK<br>
@@ -19,8 +22,8 @@ do_compile_prepend() {<br>
}<br>
<br>
do_install() {<br>
- oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui<br>
- rm ${D}${bindir}/trace-cmd<br>
- rm -rf ${D}${datadir}/trace-cmd<br>
- rmdir ${D}${datadir}<br>
+ oe_runmake DESTDIR="${D}" install_gui<br>
+ rm ${D}${bindir}/trace-cmd<br>
+ rm -rf ${D}${libdir}/trace-cmd<br>
+ rmdir ${D}${libdir}<br>
}<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.3.0<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>