summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/conf/distro/include/ptest-packagelists.inc1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb2
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch28
-rwxr-xr-xmeta/recipes-kernel/lttng/babeltrace2/run-ptest9
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb92
7 files changed, 134 insertions, 0 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 79ebcaee29..0e4a9a9f8f 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -15,6 +15,7 @@ DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core"
15DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk" 15DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk"
16DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" 16DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover"
17DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT" 17DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT"
18DISTRO_PN_ALIAS_pn-babeltrace2 = "OSPDT"
18DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debian=bjam" 19DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debian=bjam"
19DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool" 20DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool"
20DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez" 21DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 10095ffe76..adb18228e7 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -59,6 +59,7 @@ RECIPE_MAINTAINER_pn-automake = "Robert Yang <liezhi.yang@windriver.com>"
59RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <yi.zhao@windriver.com>" 59RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <yi.zhao@windriver.com>"
60RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <yi.zhao@windriver.com>" 60RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <yi.zhao@windriver.com>"
61RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <alex.kanavin@gmail.com>" 61RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <alex.kanavin@gmail.com>"
62RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin <alex.kanavin@gmail.com>"
62RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>" 63RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>"
63RECIPE_MAINTAINER_pn-base-passwd = "Anuj Mittal <anuj.mittal@intel.com>" 64RECIPE_MAINTAINER_pn-base-passwd = "Anuj Mittal <anuj.mittal@intel.com>"
64RECIPE_MAINTAINER_pn-bash = "Hongxu Jia <hongxu.jia@windriver.com>" 65RECIPE_MAINTAINER_pn-bash = "Hongxu Jia <hongxu.jia@windriver.com>"
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index 4afac58e3a..d6f3aafc7f 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -64,6 +64,7 @@ PTESTS_FAST = "\
64 64
65PTESTS_SLOW = "\ 65PTESTS_SLOW = "\
66 babeltrace-ptest \ 66 babeltrace-ptest \
67 babeltrace2-ptest \
67 busybox-ptest \ 68 busybox-ptest \
68 dbus-test-ptest \ 69 dbus-test-ptest \
69 e2fsprogs-ptest \ 70 e2fsprogs-ptest \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 984c2fac92..ac180b542a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -46,6 +46,7 @@ LTTNGMODULES = "lttng-modules"
46LTTNGMODULES_arc = "" 46LTTNGMODULES_arc = ""
47 47
48BABELTRACE = "babeltrace" 48BABELTRACE = "babeltrace"
49BABELTRACE2 = "babeltrace2"
49 50
50# valgrind does not work on the following configurations/architectures 51# valgrind does not work on the following configurations/architectures
51 52
@@ -69,6 +70,7 @@ RDEPENDS_${PN} = "\
69 ${LTTNGTOOLS} \ 70 ${LTTNGTOOLS} \
70 ${LTTNGMODULES} \ 71 ${LTTNGMODULES} \
71 ${BABELTRACE} \ 72 ${BABELTRACE} \
73 ${BABELTRACE2} \
72 ${SYSTEMTAP} \ 74 ${SYSTEMTAP} \
73 ${VALGRIND} \ 75 ${VALGRIND} \
74 " 76 "
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch
new file mode 100644
index 0000000000..805dde8064
--- /dev/null
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch
@@ -0,0 +1,28 @@
1From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001
2Message-Id: <582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux@gmail.com>
3From: Anders Wallin <wallinux@gmail.com>
4Date: Thu, 5 Mar 2020 11:20:04 +0100
5Subject: [PATCH] tests: do not run test applications from .libs
6
7Cross compile specific change
8
9Upstream-Status: Inappropriate [oe-core specific]
10
11Signed-off-by: Anders Wallin <wallinux@gmail.com>
12---
13 tests/lib/test_plugin | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin
17index 652c90cc..1f817c50 100755
18--- a/tests/lib/test_plugin
19+++ b/tests/lib/test_plugin
20@@ -26,4 +26,4 @@ fi
21 # shellcheck source=../utils/utils.sh
22 source "$UTILSSH"
23
24-"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs"
25+"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins"
26--
272.25.1
28
diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest
new file mode 100755
index 0000000000..72fe223436
--- /dev/null
+++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest
@@ -0,0 +1,9 @@
1#!/bin/sh
2# use target=recheck if you want to recheck failing tests
3[ "$target" = "" ] && target=check
4
5# Without --ignore-exit, the tap harness causes any FAILs within a
6# test plan to raise ERRORs; this is just noise.
7makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3"
8
9exec make -C tests -k -s $makeargs $target 2>/dev/null
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
new file mode 100644
index 0000000000..16953d6807
--- /dev/null
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
@@ -0,0 +1,92 @@
1SUMMARY = "Babeltrace2 - Trace Format Babel Tower"
2DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."
3HOMEPAGE = "http://babeltrace.org/"
4BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace"
5LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e"
7
8DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
9
10SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \
11 file://run-ptest \
12 file://0001-tests-do-not-run-test-applications-from-.libs.patch \
13 "
14SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910"
15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
16
17S = "${WORKDIR}/git"
18
19inherit autotools pkgconfig ptest
20
21EXTRA_OECONF = "--disable-debug-info"
22
23PACKAGECONFIG ??= "manpages"
24PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native"
25
26FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a"
27FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so"
28
29ASNEEDED = ""
30
31RDEPENDS_${PN}-ptest += "bash gawk python3"
32
33do_compile_ptest () {
34 make -C tests all
35}
36
37do_install_ptest () {
38 install -d "${D}${PTEST_PATH}/tests"
39
40 # Copy required files from source directory
41 for d in $(find "${S}/tests" -type d -printf '%P ') ; do
42 install -d "${D}${PTEST_PATH}/tests/$d"
43 find "${S}/tests/$d" -maxdepth 1 -executable -type f \
44 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} +
45 find "${S}/tests/$d" -maxdepth 1 -name *.sh \
46 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;
47 find "${S}/tests/$d" -maxdepth 1 -name *.py \
48 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;
49 find "${S}/tests/$d" -maxdepth 1 -name *.expect \
50 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;
51 done
52 install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/"
53 cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/
54
55 # Copy the tests directory tree and the executables and
56 # Makefiles found within.
57 install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/"
58 for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do
59 install -d "${D}${PTEST_PATH}/tests/$d"
60 find "${B}/tests/$d" -maxdepth 1 -executable -type f \
61 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} +
62 test -r "${B}/tests/$d/Makefile" && \
63 install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"
64 find "${B}/tests/$d" -maxdepth 1 -name *.sh \
65 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;
66 done
67
68 for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do
69 for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do
70 cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f
71 done
72 done
73
74 # Prevent attempts to update Makefiles during test runs, and
75 # silence "Making check in $SUBDIR" messages.
76 find "${D}${PTEST_PATH}" -name Makefile -type f -exec \
77 sed -i \
78 -e '/Makefile:/,/^$/d' \
79 -e '/%: %.in/,/^$/d' \
80 -e '/echo "Making $$target in $$subdir"; \\/d' \
81 -e 's/^srcdir = \(.*\)/srcdir = ./' \
82 -e 's/^builddir = \(.*\)/builddir = ./' \
83 -e 's/^all-am:.*/all-am:/' \
84 {} +
85
86 # Substitute links to installed binaries.
87 install -d "${D}${PTEST_PATH}/src/cli/"
88 ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/
89
90 # Remove architechture specific testfiles
91 rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/*
92}