diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools')
5 files changed, 37 insertions, 111 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch new file mode 100644 index 000000000..6c8a9b211 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch @@ -0,0 +1,33 @@ +From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Wed, 15 Jun 2016 17:18:03 -0400 +Subject: [PATCH] Fix: error.h -> common/error.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> +Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com> +--- + src/bin/lttng-sessiond/agent.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c +index 7cbbbde..310a7e8 100644 +--- a/src/bin/lttng-sessiond/agent.c ++++ b/src/bin/lttng-sessiond/agent.c +@@ -29,7 +29,7 @@ + #include "agent.h" + #include "ust-app.h" + #include "utils.h" +-#include "error.h" ++#include "common/error.h" + + #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS) + +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch deleted file mode 100644 index d05c04c66..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Fri, 4 Dec 2015 16:11:41 +0000 -Subject: [PATCH] Revert "Build: look for python >= 3.0 when building python bindings" -Organization: O.S. Systems Software LTDA. - -This reverts commit 227703a2ceada3c104edd56756d48455ca4c271a. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4dee4b4..6608bcd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -339,7 +339,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes]) - - if test "x${enable_python_binding:-yes}" = xyes; then - AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ]) -- AM_PATH_PYTHON([3.0]) -+ AM_PATH_PYTHON - - AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config]) - AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config]) --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest index e758815c7..623006344 100755 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest @@ -1,4 +1,5 @@ #!/bin/sh - -make -C tests installcheck - +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit" +make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch deleted file mode 100644 index 958bce48e..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -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' diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch deleted file mode 100644 index bd4f7d1d1..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1f54181c2df1fb92c3323a6dbf8273fb66b883b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= - <jeremie.galarneau@efficios.com> -Date: Sat, 17 Oct 2015 19:41:47 -0400 -Subject: [PATCH] Port: Don't use SIGUNUSED which is not defined on Solaris -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: O.S. Systems Software LTDA. - -Upstream-Status: Backport [2.8.0] - -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> ---- - src/common/runas.c | 18 +++++------------- - 1 file changed, 5 insertions(+), 13 deletions(-) - -diff --git a/src/common/runas.c b/src/common/runas.c -index 57f7382..0825470 100644 ---- a/src/common/runas.c -+++ b/src/common/runas.c -@@ -530,21 +530,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid) - static - int reset_sighandler(void) - { -- int sig, ret = 0; -+ int sig; - -- for (sig = SIGHUP; sig <= SIGUNUSED; sig++) { -- /* Skip unblockable signals. */ -- if (sig == SIGKILL || sig == SIGSTOP) { -- continue; -- } -- if (signal(sig, SIG_DFL) == SIG_ERR) { -- PERROR("reset signal %d", sig); -- ret = -1; -- goto end; -- } -+ DBG("Resetting run_as worker signal handlers to default"); -+ for (sig = 1; sig <= 31; sig++) { -+ (void) signal(sig, SIG_DFL); - } --end: -- return ret; -+ return 0; - } - - static --- -2.6.2 - |
