diff options
author | Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com> | 2019-03-13 20:55:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-24 16:48:38 +0000 |
commit | 70ab97087f9626e236722091129bde2820be134d (patch) | |
tree | 5feca35b0747d03cfd5b87e717a2b0f930c984cf /meta/recipes-kernel | |
parent | 71a09dc251ccf960e1df5116de36be001a7f5ad9 (diff) | |
download | poky-70ab97087f9626e236722091129bde2820be134d.tar.gz |
lttng-tools: update to 2.9.11
Update 0001-Allow-multiple-attempts-to-connect-to-relayd.patch chunk
accordingly.
(From OE-Core rev: eb9668b5db2d61a25e47e77f4c35ba4e4b62c2cd)
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch | 17 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb) | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch index 62a0978592..0998fc3860 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch | |||
@@ -16,17 +16,17 @@ Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> | |||
16 | Signed-off-by: He Zhe <zhe.he@windriver.com> | 16 | Signed-off-by: He Zhe <zhe.he@windriver.com> |
17 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
18 | --- | 18 | --- |
19 | src/bin/lttng-sessiond/cmd.c | 8 -------- | 19 | src/bin/lttng-sessiond/cmd.c | 8 -------- |
20 | 1 file changed, 8 deletions(-) | 20 | 1 file changed, 8 deletions(-) |
21 | 21 | ||
22 | diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c | 22 | diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c |
23 | index 73b4ce3..36f62ee 100644 | 23 | index cf30b8e..cc41a48 100644 |
24 | --- a/src/bin/lttng-sessiond/cmd.c | 24 | --- a/src/bin/lttng-sessiond/cmd.c |
25 | +++ b/src/bin/lttng-sessiond/cmd.c | 25 | +++ b/src/bin/lttng-sessiond/cmd.c |
26 | @@ -689,14 +689,6 @@ close_sock: | 26 | @@ -945,14 +945,6 @@ static int send_consumer_relayd_socket(enum lttng_domain_type domain, |
27 | free(rsock); | 27 | */ |
28 | 28 | ||
29 | error: | 29 | close_sock: |
30 | - if (ret != LTTNG_OK) { | 30 | - if (ret != LTTNG_OK) { |
31 | - /* | 31 | - /* |
32 | - * The consumer output for this session should not be used anymore | 32 | - * The consumer output for this session should not be used anymore |
@@ -35,9 +35,8 @@ index 73b4ce3..36f62ee 100644 | |||
35 | - */ | 35 | - */ |
36 | - consumer->enabled = 0; | 36 | - consumer->enabled = 0; |
37 | - } | 37 | - } |
38 | return ret; | 38 | (void) relayd_close(rsock); |
39 | } | 39 | free(rsock); |
40 | 40 | ||
41 | -- | 41 | -- |
42 | 1.7.9.5 | 42 | 2.17.1 |
43 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb b/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb index 0314b53637..5e3fc1aab2 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb | |||
@@ -34,8 +34,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ | |||
34 | file://lttng-sessiond.service \ | 34 | file://lttng-sessiond.service \ |
35 | " | 35 | " |
36 | 36 | ||
37 | SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96" | 37 | SRC_URI[md5sum] = "f9c2b35810790f5bd802483eb14cb301" |
38 | SRC_URI[sha256sum] = "77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c" | 38 | SRC_URI[sha256sum] = "2c45144acf8dc6fcd655be7370a022e9c03c8b7419af489c9c2e786a335006db" |
39 | 39 | ||
40 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd | 40 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd |
41 | 41 | ||