summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch33
-rwxr-xr-xmeta/recipes-kernel/lttng/lttng-tools/run-ptest5
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch35
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb127
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb120
5 files changed, 165 insertions, 155 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
deleted file mode 100644
index 6c8a9b211a..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Wed, 15 Jun 2016 17:18:03 -0400
4Subject: [PATCH] Fix: error.h -> common/error.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Backport
10
11Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
12Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
13Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
14---
15 src/bin/lttng-sessiond/agent.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
19index 7cbbbde..310a7e8 100644
20--- a/src/bin/lttng-sessiond/agent.c
21+++ b/src/bin/lttng-sessiond/agent.c
22@@ -29,7 +29,7 @@
23 #include "agent.h"
24 #include "ust-app.h"
25 #include "utils.h"
26-#include "error.h"
27+#include "common/error.h"
28
29 #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS)
30
31--
321.9.1
33
diff --git a/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/meta/recipes-kernel/lttng/lttng-tools/run-ptest
index 6230063442..705030ee53 100755
--- a/meta/recipes-kernel/lttng/lttng-tools/run-ptest
+++ b/meta/recipes-kernel/lttng/lttng-tools/run-ptest
@@ -1,5 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# Without --ignore-exit, the tap harness causes any FAILs within a 2# Without --ignore-exit, the tap harness causes any FAILs within a
3# test plan to raise ERRORs; this is just noise. 3# test plan to raise ERRORs; this is just noise.
4makeargs="LOG_DRIVER_FLAGS=--ignore-exit" 4makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD"
5make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null 5make -k -t all >/dev/null 2>&1
6exec make -s $makeargs check 2>/dev/null
diff --git a/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
new file mode 100644
index 0000000000..f08198208d
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
@@ -0,0 +1,35 @@
1From 4545eae3bccb0f5a97509d1405a28000029a8d7d Mon Sep 17 00:00:00 2001
2From: Nathan Lynch <nathan_lynch@mentor.com>
3Date: Mon, 9 Jan 2017 16:14:28 -0600
4Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils shell
5 library
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10tests/utils/utils.sh is always sourced, never executed, and
11/src/bin/bash is not a typical path for a shell interpreter. Just
12delete it.
13
14Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
15Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
16---
17
18Upstream-Status: Backport
19
20 tests/utils/utils.sh | 2 --
21 1 file changed, 2 deletions(-)
22
23diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
24index 05d88650e9f3..9db0640b70f3 100644
25--- a/tests/utils/utils.sh
26+++ b/tests/utils/utils.sh
27@@ -1,5 +1,3 @@
28-#!/src/bin/bash
29-#
30 # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
31 #
32 # This library is free software; you can redistribute it and/or modify it under
33--
342.7.4
35
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
new file mode 100644
index 0000000000..741d884d9c
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
@@ -0,0 +1,127 @@
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 libxml2 util-linux"
13RDEPENDS_${PN} = "libgcc"
14RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps"
15# babelstats.pl wants getopt-long
16RDEPENDS_${PN}-ptest += "perl-module-getopt-long"
17
18PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
19 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
20 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \
21"
22PACKAGECONFIG ??= "lttng-ust"
23PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
24PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
25PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
26PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
27PACKAGECONFIG_remove_libc-musl = "lttng-ust"
28
29SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
30 file://x32.patch \
31 file://utils-remove-bogus-interpreter.patch \
32 file://run-ptest"
33
34SRC_URI[md5sum] = "19fdcc5e9c307ef66581a2743a08a541"
35SRC_URI[sha256sum] = "a6e6baaaa977dcbc9bce6b675881eec664599b86f0d905a7b0b508539407b24e"
36
37inherit autotools ptest pkgconfig useradd python3-dir manpages
38
39USERADD_PACKAGES = "${PN}"
40GROUPADD_PARAM_${PN} = "tracing"
41
42FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \
43 ${PYTHON_SITEPACKAGES_DIR}/*"
44FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
45FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
46
47# Since files are installed into ${libdir}/lttng/libexec we match
48# the libexec insane test so skip it.
49# Python module needs to keep _lttng.so
50INSANE_SKIP_${PN} = "libexec dev-so"
51INSANE_SKIP_${PN}-dbg = "libexec"
52
53do_configure_prepend () {
54 # Delete a shipped m4 file that overrides our patched one
55 rm -f ${S}/m4/libxml.m4
56}
57
58do_install_ptest () {
59 for f in Makefile tests/Makefile tests/utils/utils.sh ; do
60 install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
61 done
62
63 for f in config/tap-driver.sh config/test-driver ; do
64 install -D "${S}/$f" "${D}${PTEST_PATH}/$f"
65 done
66
67 # Prevent 'make check' from recursing into non-test subdirectories.
68 sed -i -e 's!^SUBDIRS = .*!SUBDIRS = tests!' "${D}${PTEST_PATH}/Makefile"
69
70 # We don't need these
71 sed -i -e '/dist_noinst_SCRIPTS = /,/^$/d' "${D}${PTEST_PATH}/tests/Makefile"
72
73 # We shouldn't need to build anything in tests/utils
74 sed -i -e 's!am__append_1 = . utils!am__append_1 = . !' \
75 "${D}${PTEST_PATH}/tests/Makefile"
76
77 # Copy the tests directory tree and the executables and
78 # Makefiles found within.
79 for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do
80 install -d "${D}${PTEST_PATH}/tests/$d"
81 find "${B}/tests/$d" -maxdepth 1 -executable -type f \
82 -exec install -t "${D}${PTEST_PATH}/tests/$d" {} +
83 test -r "${B}/tests/$d/Makefile" && \
84 install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"
85 done
86
87 # We shouldn't need to build anything in tests/regression/tools
88 sed -i -e 's!^SUBDIRS = tools !SUBDIRS = !' \
89 "${D}${PTEST_PATH}/tests/regression/Makefile"
90
91 # Prevent attempts to update Makefiles during test runs, and
92 # silence "Making check in $SUBDIR" messages.
93 find "${D}${PTEST_PATH}" -name Makefile -type f -exec \
94 sed -i -e '/Makefile:/,/^$/d' -e '/%: %.in/,/^$/d' \
95 -e '/echo "Making $$target in $$subdir"; \\/d' \
96 -e 's/^srcdir = \(.*\)/srcdir = ./' \
97 -e 's/^builddir = \(.*\)/builddir = ./' \
98 -e 's/^all-am:.*/all-am:/' \
99 {} +
100
101 # These objects trigger [rpaths] QA checks; the test harness
102 # skips the associated tests if they're missing, so delete
103 # them.
104 objs=""
105 objs="$objs regression/ust/ust-dl/libbar.so"
106 objs="$objs regression/ust/ust-dl/libfoo.so"
107 for obj in $objs ; do
108 rm -f "${D}${PTEST_PATH}/tests/${obj}"
109 done
110
111 find "${D}${PTEST_PATH}" -name Makefile -type f -exec \
112 touch -r "${B}/Makefile" {} +
113
114 # Substitute links to installed binaries.
115 for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do
116 exedir="${D}${PTEST_PATH}/src/bin/${prog}"
117 install -d "$exedir"
118 case "$prog" in
119 lttng-consumerd)
120 ln -s "${libdir}/lttng/libexec/$prog" "$exedir"
121 ;;
122 *)
123 ln -s "${bindir}/$prog" "$exedir"
124 ;;
125 esac
126 done
127}
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
deleted file mode 100644
index 29fd75b217..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ /dev/null
@@ -1,120 +0,0 @@
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 libxml2 util-linux"
13RDEPENDS_${PN} = "libgcc"
14RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps"
15# babelstats.pl wants getopt-long
16RDEPENDS_${PN}-ptest += "perl-module-getopt-long"
17
18SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b"
19PV = "2.8.1+git${SRCPV}"
20
21PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
22 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
23 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \
24"
25PACKAGECONFIG ??= "lttng-ust"
26PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
27PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
28PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
29PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
30PACKAGECONFIG_remove_libc-musl = "lttng-ust"
31
32SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
33 file://0001-Fix-error.h-common-error.h.patch \
34 file://x32.patch \
35 file://run-ptest"
36
37S = "${WORKDIR}/git"
38
39inherit autotools-brokensep ptest pkgconfig useradd python3-dir manpages
40
41USERADD_PACKAGES = "${PN}"
42GROUPADD_PARAM_${PN} = "tracing"
43
44FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \
45 ${PYTHON_SITEPACKAGES_DIR}/*"
46FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
47FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
48
49# Since files are installed into ${libdir}/lttng/libexec we match
50# the libexec insane test so skip it.
51# Python module needs to keep _lttng.so
52INSANE_SKIP_${PN} = "libexec dev-so"
53INSANE_SKIP_${PN}-dbg = "libexec"
54
55do_configure_prepend () {
56 # Delete a shipped m4 file that overrides our patched one
57 rm -f ${S}/m4/libxml.m4
58}
59
60do_install_ptest () {
61 mkdir -p ${D}${PTEST_PATH}
62
63 cp -a -T ${B} ${D}${PTEST_PATH}
64
65 # Prevent attempts to update Makefiles during test runs, and
66 # silence "Making check in $SUBDIR" messages.
67 find ${D}${PTEST_PATH} -name Makefile -type f -exec \
68 sed -i -e 's!^Makefile:!_Makefile:!' \
69 -e '/echo "Making $$target in $$subdir"; \\/d' {} +
70
71 # Prevent attempts to update version.h during test runs.
72 sed -i -e '/^\.PHONY: version\.h$/d' ${D}${PTEST_PATH}/include/Makefile
73
74 # Silence "Making check in $SUBDIR" messages.
75 find ${D}${PTEST_PATH} -name Makefile -type f -exec \
76 sed -i -e '/echo "Making $$target in $$subdir"; \\/d' {} +
77
78 # Substitute links to installed binaries.
79 for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do
80 orig="${D}${PTEST_PATH}/src/bin/${prog}/${prog}"
81 rm "$orig"
82 case "$prog" in
83 lttng-consumerd)
84 ln -s "${libdir}/lttng/libexec/$prog" "$orig"
85 ;;
86 *)
87 ln -s "${bindir}/$prog" "$orig"
88 ;;
89 esac
90 done
91
92 # Remove libtool artifacts.
93 find ${D}${PTEST_PATH} \( -name '*.l[ao]' -o -name '*.lai' \) -delete
94
95 # Remove object files and archives.
96 find ${D}${PTEST_PATH} -name '*.[oa]' -type f -delete
97
98 # Remove Makefile.am and Makefile.in.
99 find ${D}${PTEST_PATH} -name 'Makefile.*' -type f -delete
100
101 # Remove autom4te.cache.
102 rm -rf ${D}${PTEST_PATH}/autom4te.cache
103
104 # Replace libtool wrapper scripts (which won't work on the
105 # target) with their corresponding binaries.
106 for prog in unit/ini_config/ini_config \
107 regression/tools/live/live_test \
108 regression/tools/health/health_check ; do
109 basename=${prog##*/}
110 ldir=${D}${PTEST_PATH}/tests/${prog%/*}
111 mv -f ${ldir}/.libs/${basename} ${ldir}
112 done
113
114 # checkpatch.pl is unneeded on target and causes file-rdeps QA
115 # warnings.
116 rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl
117
118 # Remove built libraries as they confuse the packages' runtime dependency resolution
119 rm -rf ${D}${PTEST_PATH}/src/lib/lttng-ctl/.libs/
120}