diff options
author | Nathan Lynch <nathan_lynch@mentor.com> | 2017-01-16 12:51:45 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-19 22:47:21 +0000 |
commit | 9ba3f6d20fdcf3cd29029ec8bd3ce201523018be (patch) | |
tree | 1a5a9297a9a854a710c3991ac9bbc0f959f3b81f /meta/recipes-kernel/lttng/lttng-tools | |
parent | 493af5a84c50c93bca097f91f5e62ffeafb13a15 (diff) | |
download | poky-9ba3f6d20fdcf3cd29029ec8bd3ce201523018be.tar.gz |
lttng-tools: upgrade to 2.9.3
Notable recipe changes:
* switch to using release tarball
* brokensep no longer required
* drop upstreamed error.h patch
* change do_install_ptest to selectively copy build artifacts to
install tree.
* use backported patch to address file-rdeps warning
(From OE-Core rev: 0846aaa429a18557129579260ff09c0145aba903)
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools')
3 files changed, 38 insertions, 35 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 @@ | |||
1 | From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Wed, 15 Jun 2016 17:18:03 -0400 | ||
4 | Subject: [PATCH] Fix: error.h -> common/error.h | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
12 | Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> | ||
13 | Signed-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 | |||
18 | diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c | ||
19 | index 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 | -- | ||
32 | 1.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. |
4 | makeargs="LOG_DRIVER_FLAGS=--ignore-exit" | 4 | makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" |
5 | make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null | 5 | make -k -t all >/dev/null 2>&1 |
6 | exec 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 @@ | |||
1 | From 4545eae3bccb0f5a97509d1405a28000029a8d7d Mon Sep 17 00:00:00 2001 | ||
2 | From: Nathan Lynch <nathan_lynch@mentor.com> | ||
3 | Date: Mon, 9 Jan 2017 16:14:28 -0600 | ||
4 | Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils shell | ||
5 | library | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | tests/utils/utils.sh is always sourced, never executed, and | ||
11 | /src/bin/bash is not a typical path for a shell interpreter. Just | ||
12 | delete it. | ||
13 | |||
14 | Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> | ||
15 | Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> | ||
16 | --- | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | tests/utils/utils.sh | 2 -- | ||
21 | 1 file changed, 2 deletions(-) | ||
22 | |||
23 | diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh | ||
24 | index 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 | -- | ||
34 | 2.7.4 | ||
35 | |||