mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

lttng-tools: Add version 2.4.0

Browse Source 
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>
This commit is contained in:
Tom Zanussi
2014-03-06 22:26:17 -06:00
committed by Richard Purdie
parent 89f30af117
commit 46959f1551
2 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch Normal file
View File

@@ -0,0 +1,27 @@
diff --git a/Makefile.am b/Makefile.am
index 584f59b..c2bcabd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,3 +12,9 @@ dist_doc_DATA = LICENSE \
dist_noinst_DATA = CodingStyle
EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt
+
+install-ptest:
+ cp -r $(srcdir)/tests $(DESTDIR)
+ for m in $$(find $(DESTDIR)/tests -name Makefile); do \
+ sed -i -e 's|^Makefile:|_Makefile:|' $$m; \
+ done
diff --git a/tests/run.sh b/tests/run.sh
index c6c50fd..6455359 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -19,4 +19,7 @@
[ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1
-prove --merge --exec '' - < $1
+prove --merge -v --exec '' - < $1 | sed \
+ -e 's|^ok \(.*\)|PASS: \1|' \
+ -e 's|^not ok \(.*\)|FAIL: \1|' \
+ | egrep -h 'PASS|FAIL'

59
meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb Normal file
View File

@@ -0,0 +1,59 @@
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 \
"
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
}