summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2014-03-06 22:26:17 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:49:31 +0000
commit46959f155119fd6a3f4cd893eb2c32fec6092e08 (patch)
treed04da9fc709a90b4d982e9254985022eb804fb2d /meta
parent89f30af117c5150fd9a31fd59297c46ac269dac1 (diff)
downloadpoky-46959f155119fd6a3f4cd893eb2c32fec6092e08.tar.gz
lttng-tools: Add version 2.4.0
This updates lttng-tools to 2.4.0, codenamed Époque Opaque, needed for interoperability with lttng-modules and the 3.14 (dev) kernel. (From OE-Core rev: da5aaafa8c47d9daadb34adbddc93e0f18ec6259) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch27
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb59
2 files changed, 86 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch b/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch
new file mode 100644
index 0000000000..958bce48e0
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch
@@ -0,0 +1,27 @@
1diff --git a/Makefile.am b/Makefile.am
2index 584f59b..c2bcabd 100644
3--- a/Makefile.am
4+++ b/Makefile.am
5@@ -12,3 +12,9 @@ dist_doc_DATA = LICENSE \
6 dist_noinst_DATA = CodingStyle
7
8 EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt
9+
10+install-ptest:
11+ cp -r $(srcdir)/tests $(DESTDIR)
12+ for m in $$(find $(DESTDIR)/tests -name Makefile); do \
13+ sed -i -e 's|^Makefile:|_Makefile:|' $$m; \
14+ done
15diff --git a/tests/run.sh b/tests/run.sh
16index c6c50fd..6455359 100755
17--- a/tests/run.sh
18+++ b/tests/run.sh
19@@ -19,4 +19,7 @@
20
21 [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1
22
23-prove --merge --exec '' - < $1
24+prove --merge -v --exec '' - < $1 | sed \
25+ -e 's|^ok \(.*\)|PASS: \1|' \
26+ -e 's|^not ok \(.*\)|FAIL: \1|' \
27+ | egrep -h 'PASS|FAIL'
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb
new file mode 100644
index 0000000000..223b52e8ae
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb
@@ -0,0 +1,59 @@
1SECTION = "devel"
2SUMMARY = "Linux Trace Toolkit Control"
3DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \
4to extract program execution details from the Linux operating system \
5and interpret them."
6
7LICENSE = "GPLv2 & LGPLv2.1"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
9 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
11
12DEPENDS = "liburcu popt lttng-ust"
13RDEPENDS_${PN}-ptest += "make"
14
15SRCREV = "8e3234eea2d81f8a962214c570532f8e096a9a8d"
16PV = "v2.4.0"
17
18SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.4 \
19 file://runtest-2.4.0.patch \
20 file://run-ptest \
21 "
22
23S = "${WORKDIR}/git"
24
25inherit autotools-brokensep ptest
26
27export KERNELDIR="${STAGING_KERNEL_DIR}"
28
29FILES_${PN} += "${libdir}/lttng/libexec/*"
30FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
31
32# Since files are installed into ${libdir}/lttng/libexec we match
33# the libexec insane test so skip it.
34INSANE_SKIP_${PN} = "libexec"
35INSANE_SKIP_${PN}-dbg = "libexec"
36
37
38do_install_ptest () {
39 chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh
40 for i in `find ${D}/${libdir}/${PN}/ptest -perm /u+x -type f`; do
41 sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \
42 -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \
43 -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \
44 -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \
45 -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \
46 -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \
47 -e "s:\$DIR/../src/bin/lttng-sessiond/lttng-sessiond:\$SESSIOND_BIN:g" \
48 -e "s:\$DIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \
49 -e "s:\$DIR/../bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \
50 -i $i
51 done
52
53 sed -e "s:src/bin/lttng-sessiond:$bindir:g" \
54 -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \
55 -i ${D}/${libdir}/${PN}/ptest/tests/regression/run-report.py
56 sed -e "s:src/bin:bin:g" \
57 -i ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh
58
59}