diff options
Diffstat (limited to 'meta/recipes-kernel/lttng')
13 files changed, 123 insertions, 348 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch deleted file mode 100644 index 258eedd3ba..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: backport - -babeltrace: Fix support out of tree builds in babeltrace - -Signed-off-by: Lars Persson <larper@axis.com> - -diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am -index c834699..2c6b0bd 100644 ---- a/formats/lttng-live/Makefile.am -+++ b/formats/lttng-live/Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir) - - lib_LTLIBRARIES = libbabeltrace-lttng-live.la - - diff --git a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch b/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch deleted file mode 100644 index 8e81d2d781..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cae67efbd9ddf2cee6bbefec076dc8933ababc43 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= <fredrik.markstrom@gmail.com> -Date: Fri, 16 May 2014 10:10:38 +0800 -Subject: [PATCH] Fix: Align buffers from objstack_alloc on sizeof(void *) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport - -The buffers from objstack_alloc will store pointers, so they must -be aligned on a pointer's size, or else it will cause issues on the -CPUs which do not support unaligned addresses access. - -Signed-off-by: Fredrik Markstrom <fredrik.markstrom@gmail.com> -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> ---- - formats/ctf/metadata/objstack.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/formats/ctf/metadata/objstack.c b/formats/ctf/metadata/objstack.c -index 9e264a4..14d9252 100644 ---- a/formats/ctf/metadata/objstack.c -+++ b/formats/ctf/metadata/objstack.c -@@ -27,6 +27,7 @@ - #include <stdlib.h> - #include <babeltrace/list.h> - #include <babeltrace/babeltrace-internal.h> -+#include <babeltrace/align.h> - - #define OBJSTACK_INIT_LEN 128 - #define OBJSTACK_POISON 0xcc -@@ -39,7 +40,7 @@ struct objstack_node { - struct bt_list_head node; - size_t len; - size_t used_len; -- char data[]; -+ char __attribute__ ((aligned (sizeof(void *)))) data[]; - }; - - BT_HIDDEN -@@ -118,6 +119,8 @@ void *objstack_alloc(struct objstack *objstack, size_t len) - struct objstack_node *last_node; - void *p; - -+ len = ALIGN(len, sizeof(void *)); -+ - /* Get last node */ - last_node = bt_list_entry(objstack->head.prev, - struct objstack_node, node); --- -1.7.10.4 - diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb index a8ea4cb213..f616146393 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb @@ -8,15 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" inherit autotools pkgconfig -DEPENDS = "glib-2.0 util-linux popt" +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79" -PV = "1.2.1+git${SRCPV}" +SRCREV = "90395824efc007de88787a6b8e400a07c980be1c" +PV = "1.2.4+git${SRCPV}" -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \ - file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch \ - file://Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch \ -" +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch index 30f825c414..bbfa38a0b5 100644 --- a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch +++ b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch @@ -8,11 +8,11 @@ it as-is. Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> -diff --git a/Makefile b/Makefile -index a9d1cb1..c1b65b9 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,19 +43,19 @@ obj-m += lib/ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -62,19 +62,19 @@ obj-m += lib/ endif # CONFIG_TRACEPOINTS else # KERNELRELEASE @@ -37,26 +37,11 @@ index a9d1cb1..c1b65b9 100644 - $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ endif # KERNELRELEASE -diff --git a/README b/README -index 8c5dd46..6bd3334 100644 ---- a/README -+++ b/README -@@ -27,8 +27,8 @@ access to your full kernel source tree), and use: - If you need to specify the target directory to the kernel you want to build - against, use: - --% KERNELDIR=path_to_kernel_dir make --# KERNELDIR=path_to_kernel_dir make modules_install -+% KERNEL_SRC=path_to_kernel_dir make -+# KERNEL_SRC=path_to_kernel_dir make modules_install - # depmod -a kernel_version - - Use lttng-tools to control the tracer. LTTng tools should automatically load -diff --git a/probes/Makefile b/probes/Makefile -index 225803c..3449866 100644 ---- a/probes/Makefile -+++ b/probes/Makefile -@@ -212,18 +212,18 @@ endif +Index: git/probes/Makefile +=================================================================== +--- git.orig/probes/Makefile ++++ git/probes/Makefile +@@ -231,18 +231,18 @@ endif endif else diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb deleted file mode 100644 index 81a3983c64..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "devel" -SUMMARY = "Linux Trace Toolkit KERNEL MODULE" -DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ - file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ - file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" - -DEPENDS = "virtual/kernel" - -inherit module - -SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377" -PV = "2.3.3" - -SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \ - file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ - file://bio-bvec-iter.patch \ - " - -export INSTALL_MOD_DIR="kernel/lttng-modules" -export KERNEL_SRC="${STAGING_KERNEL_DIR}" - - -S = "${WORKDIR}/git" - -do_install_append() { - # Delete empty directories to avoid QA failures if no modules were built - find ${D}/lib -depth -type d -empty -exec rmdir {} \; -} - -python do_package_prepend() { - if not os.path.exists(os.path.join(d.getVar('D', True), 'lib/modules')): - bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN', True)) -} - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb index 5e05ffc698..d0039b3b14 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb @@ -1,22 +1,21 @@ SECTION = "devel" SUMMARY = "Linux Trace Toolkit KERNEL MODULE" DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPLv2.1 & GPLv2 & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "virtual/kernel" +do_configure[depends] += "virtual/kernel:do_shared_workdir" inherit module -SRCREV = "a0383def517e3aebbbcebae61fe2bcfb50d31e71" -PV = "2.4.1" +SRCREV = "9e8bcbf975844986f021e99e2a30ceedc41b46a8" -# lttng currently blacklists arm with gcc-4.8 -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux' +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' -SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.4 \ +SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ " 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?= <fredrik.markstrom@gmail.com> -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 <fredrik.markstrom@gmail.com> -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - 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.3.1.bb b/meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb deleted file mode 100644 index db8b65b2e7..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools_2.3.1.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 = "5d985544a7ad54afa0514ea7f522a89d8d844860" -PV = "v2.3.1" - -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.3 \ - file://runtest.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.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.6.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb new file mode 100644 index 0000000000..f0969b5241 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb @@ -0,0 +1,80 @@ +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 perl bash" + +SRCREV = "d522c1f14285e2e8b10b7c0cd011847696ffe779" + +PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ + am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ + PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \ +" +PACKAGECONFIG ??= "lttng-ust" +PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" +PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" + +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.6 \ + file://runtest-2.4.0.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest pkgconfig useradd + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "tracing" + +export KERNELDIR="${STAGING_KERNEL_DIR}" + +FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ + ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug \ + ${libdir}/python2.7/site-packages/.debug" +FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" +FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la" + +# Since files are installed into ${libdir}/lttng/libexec we match +# the libexec insane test so skip it. +# Python module needs to keep _lttng.so +INSANE_SKIP_${PN} = "libexec dev-so" +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}${PTEST_PATH}/tests/utils/utils.sh + for i in `find ${D}${PTEST_PATH} -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}${PTEST_PATH}/tests/regression/run-report.py + sed -e "s:src/bin:bin:g" -e "s:lt-::g" \ + -i ${D}${PTEST_PATH}/tests/utils/utils.sh + sed -e "s:ini_config:\.libs\/ini_config:" \ + -i ${D}${PTEST_PATH}/tests/unit/ini_config/test_ini_config +} diff --git a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch new file mode 100644 index 0000000000..cec5410369 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch @@ -0,0 +1,19 @@ +lttng-ust: add aarch64 recognition + +Treat the same as "arm". + +Upstream-Status: Pending + +Signed-off-by: joe.slater@windriver.com + + +--- a/configure.ac ++++ b/configure.ac +@@ -230,6 +230,7 @@ changequote([,])dnl + s390) NO_UNALIGNED_ACCESS=1 ;; + s390x) NO_UNALIGNED_ACCESS=1 ;; + arm*) NO_UNALIGNED_ACCESS=1 ;; ++ aarch64) NO_UNALIGNED_ACCESS=1 ;; + mips*) NO_UNALIGNED_ACCESS=1 ;; + tile*) NO_UNALIGNED_ACCESS=1 ;; + *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;; diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb deleted file mode 100644 index 44e3e2bc9c..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x" -DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library to trace userspace codes." -HOMEPAGE = "http://lttng.org/ust" -BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" - -LICENSE = "LGPLv2.1+ & BSD & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ - file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ - file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" - -inherit autotools lib_package - -DEPENDS = "liburcu util-linux" -RDEPENDS_${PN} = "python" - -# For backwards compatibility after rename -RPROVIDES_${PN} = "lttng2-ust" -RREPLACES_${PN} = "lttng2-ust" -RCONFLICTS_${PN} = "lttng2-ust" - -SRCREV = "535d0408caee93577c2b4d8ad3cd672fa97eac1d" -PV = "2.3.1" -PE = "2" - -SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.3 \ - " - -S = "${WORKDIR}/git" - -do_configure_prepend () { - ( cd ${S}; ${S}/bootstrap ) -} diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb index 1629554b09..080e7448b2 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library t HOMEPAGE = "http://lttng.org/ust" BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" -LICENSE = "LGPLv2.1+ & BSD & GPLv2" +LICENSE = "LGPLv2.1+ & MIT & GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" @@ -11,18 +11,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ inherit autotools lib_package DEPENDS = "liburcu util-linux" +RDEPENDS_${PN}-bin = "python-core" # For backwards compatibility after rename RPROVIDES_${PN} = "lttng2-ust" RREPLACES_${PN} = "lttng2-ust" RCONFLICTS_${PN} = "lttng2-ust" -SRCREV = "5ba5bf7fba804d2de773ae1c71106a8ed856c56a" -PV = "2.4.0" +SRCREV = "5748584c5ae8ca5c4da26f41b6c61bb816e6d50b" PE = "2" -SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.4 \ +SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ file://lttng-ust-doc-examples-disable.patch \ + file://add-aarch64.patch \ " S = "${WORKDIR}/git" |