From 19c16a45a3410b9ecae8682b628f2badffec9375 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 15 Aug 2014 13:11:47 +0100 Subject: lttng-tools: update to version 2.5.0 Update to latest stable-2.5 revision. * Drop Fix-alignment-problems-on-targets-not-supporting-una.patch, merged upstream. * New build-dependency on libxml2, so inherit pkgconfig so the test works and delete the copy of libxml.m4 that overrides our sysroot. Based on a patch from Yasir-Khan . Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...nt-problems-on-targets-not-supporting-una.patch | 47 ---------------- meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb | 60 --------------------- meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb | 63 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 107 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb create mode 100644 meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch b/meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch deleted file mode 100644 index 2c1756e6ed..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9dc4d3a8dcc7cfb6991e760e78f614afd593bf66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= -Date: Tue, 1 Apr 2014 17:46:23 +0200 -Subject: [PATCH v2] Fix: alignment problems on targets not supporting unaligned - access. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Submitted (https://www.mail-archive.com/lttng-dev@lists.lttng.org/msg06012.html) - -Accessing floats, doubles and 64 bit int at unaligned addresses is not -supported on all configurations of arm processors and if it is it's -emulated and slow. This patch replaces direct assignments with memcpy. - -Signed-off-by: Fredrik Markström -Signed-off-by: Roy Li -Acked-by: Mathieu Desnoyers ---- - src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c -index 762d604..8c6dc96 100644 ---- a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c -+++ b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c -@@ -222,7 +222,7 @@ int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node) - if (!insn) - return -ENOMEM; - insn->op = FILTER_OP_LOAD_S64; -- *(int64_t *) insn->data = node->u.load.u.num; -+ memcpy(insn->data, &node->u.load.u.num, sizeof(int64_t)); - ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len); - free(insn); - return ret; -@@ -237,7 +237,7 @@ int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node) - if (!insn) - return -ENOMEM; - insn->op = FILTER_OP_LOAD_DOUBLE; -- *(double *) insn->data = node->u.load.u.flt; -+ memcpy(insn->data, &node->u.load.u.flt, sizeof(double)); - ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len); - free(insn); - return ret; --- -1.7.10.4 - diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb deleted file mode 100644 index aab9bf6bbf..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb +++ /dev/null @@ -1,60 +0,0 @@ -SECTION = "devel" -SUMMARY = "Linux Trace Toolkit Control" -DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \ -to extract program execution details from the Linux operating system \ -and interpret them." - -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ - file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" - -DEPENDS = "liburcu popt lttng-ust" -RDEPENDS_${PN}-ptest += "make" - -SRCREV = "8e3234eea2d81f8a962214c570532f8e096a9a8d" -PV = "v2.4.0" - -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.4 \ - file://runtest-2.4.0.patch \ - file://run-ptest \ - file://Fix-alignment-problems-on-targets-not-supporting-una.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools-brokensep ptest - -export KERNELDIR="${STAGING_KERNEL_DIR}" - -FILES_${PN} += "${libdir}/lttng/libexec/*" -FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug" - -# Since files are installed into ${libdir}/lttng/libexec we match -# the libexec insane test so skip it. -INSANE_SKIP_${PN} = "libexec" -INSANE_SKIP_${PN}-dbg = "libexec" - - -do_install_ptest () { - chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh - for i in `find ${D}/${libdir}/${PN}/ptest -perm /u+x -type f`; do - sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ - -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-sessiond/lttng-sessiond:\$SESSIOND_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -e "s:\$DIR/../bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -i $i - done - - sed -e "s:src/bin/lttng-sessiond:$bindir:g" \ - -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \ - -i ${D}/${libdir}/${PN}/ptest/tests/regression/run-report.py - sed -e "s:src/bin:bin:g" \ - -i ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh - -} diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb new file mode 100644 index 0000000000..14e5f9ebf2 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb @@ -0,0 +1,63 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit Control" +DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \ +to extract program execution details from the Linux operating system \ +and interpret them." + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ + file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" + +DEPENDS = "liburcu popt lttng-ust libxml2" +RDEPENDS_${PN}-ptest += "make" + +SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88" +PV = "v2.5.0" + +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.5 \ + file://runtest-2.4.0.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest pkgconfig + +export KERNELDIR="${STAGING_KERNEL_DIR}" + +FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng" +FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug" + +# Since files are installed into ${libdir}/lttng/libexec we match +# the libexec insane test so skip it. +INSANE_SKIP_${PN} = "libexec" +INSANE_SKIP_${PN}-dbg = "libexec" + +do_configure_prepend () { + # Delete a shipped m4 file that overrides our patched one + rm -f ${S}/config/libxml.m4 +} + +do_install_ptest () { + chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh + for i in `find ${D}/${libdir}/${PN}/ptest -perm /u+x -type f`; do + sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \ + -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ + -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ + -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ + -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ + -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ + -e "s:\$DIR/../src/bin/lttng-sessiond/lttng-sessiond:\$SESSIOND_BIN:g" \ + -e "s:\$DIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ + -e "s:\$DIR/../bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ + -i $i + done + + sed -e "s:src/bin/lttng-sessiond:$bindir:g" \ + -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \ + -i ${D}/${libdir}/${PN}/ptest/tests/regression/run-report.py + sed -e "s:src/bin:bin:g" \ + -i ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh + +} -- cgit v1.2.3