summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>2019-03-13 20:55:55 +0000
committerArmin Kuster <akuster808@gmail.com>2019-03-22 14:40:46 -0700
commiteb9668b5db2d61a25e47e77f4c35ba4e4b62c2cd (patch)
treeebefb482f22d922197eae03ab8649e8aff394beb
parentb565ec33b908542b26527f3301672b4e3af6544c (diff)
downloadopenembedded-core-eb9668b5db2d61a25e47e77f4c35ba4e4b62c2cd.tar.gz
openembedded-core-eb9668b5db2d61a25e47e77f4c35ba4e4b62c2cd.tar.bz2
openembedded-core-eb9668b5db2d61a25e47e77f4c35ba4e4b62c2cd.zip
lttng-tools: update to 2.9.11
Update 0001-Allow-multiple-attempts-to-connect-to-relayd.patch chunk accordingly. Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch17
-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>
Signed-off-by: He Zhe <zhe.he@windriver.com>
Upstream-Status: Pending
---
- src/bin/lttng-sessiond/cmd.c | 8 --------
+ src/bin/lttng-sessiond/cmd.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
-index 73b4ce3..36f62ee 100644
+index cf30b8e..cc41a48 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
-@@ -689,14 +689,6 @@ close_sock:
- free(rsock);
+@@ -945,14 +945,6 @@ static int send_consumer_relayd_socket(enum lttng_domain_type domain,
+ */
- error:
+ close_sock:
- if (ret != LTTNG_OK) {
- /*
- * The consumer output for this session should not be used anymore
@@ -35,9 +35,8 @@ index 73b4ce3..36f62ee 100644
- */
- consumer->enabled = 0;
- }
- return ret;
- }
+ (void) relayd_close(rsock);
+ free(rsock);
--
-1.7.9.5
-
+2.17.1
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 \
file://lttng-sessiond.service \
"
-SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96"
-SRC_URI[sha256sum] = "77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c"
+SRC_URI[md5sum] = "f9c2b35810790f5bd802483eb14cb301"
+SRC_URI[sha256sum] = "2c45144acf8dc6fcd655be7370a022e9c03c8b7419af489c9c2e786a335006db"
inherit autotools ptest pkgconfig useradd python3-dir manpages systemd