diff options
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch | 43 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb) | 30 |
2 files changed, 26 insertions, 47 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 deleted file mode 100644 index 62a0978592..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 70eff899104b86bae02862927c76caaef5de5d3c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikael Beckius <mikael.beckius@windriver.com> | ||
3 | Date: Thu, 7 May 2015 16:14:25 +0200 | ||
4 | Subject: [PATCH] Allow multiple attempts to connect to relayd. | ||
5 | |||
6 | It is unclear why a session needs to be made | ||
7 | unusable after a failure to connect to relayd | ||
8 | since a check for a relayd connection is | ||
9 | always made before a session can be configured. | ||
10 | |||
11 | The behaviour was introduced in: | ||
12 | d9078d0c000d04d49c599a72c1a725026b636ec0 | ||
13 | |||
14 | Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> | ||
15 | [ The context has moved, adjust the hunk accordingly ] | ||
16 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
17 | Upstream-Status: Pending | ||
18 | --- | ||
19 | src/bin/lttng-sessiond/cmd.c | 8 -------- | ||
20 | 1 file changed, 8 deletions(-) | ||
21 | |||
22 | diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c | ||
23 | index 73b4ce3..36f62ee 100644 | ||
24 | --- a/src/bin/lttng-sessiond/cmd.c | ||
25 | +++ b/src/bin/lttng-sessiond/cmd.c | ||
26 | @@ -689,14 +689,6 @@ close_sock: | ||
27 | free(rsock); | ||
28 | |||
29 | error: | ||
30 | - if (ret != LTTNG_OK) { | ||
31 | - /* | ||
32 | - * The consumer output for this session should not be used anymore | ||
33 | - * since the relayd connection failed thus making any tracing or/and | ||
34 | - * streaming not usable. | ||
35 | - */ | ||
36 | - consumer->enabled = 0; | ||
37 | - } | ||
38 | return ret; | ||
39 | } | ||
40 | |||
41 | -- | ||
42 | 1.7.9.5 | ||
43 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb index 0314b53637..11d7db6848 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb | |||
@@ -22,7 +22,7 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ | |||
22 | PACKAGECONFIG ??= "lttng-ust" | 22 | PACKAGECONFIG ??= "lttng-ust" |
23 | PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" | 23 | PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" |
24 | PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" | 24 | PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" |
25 | PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" | 25 | PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod" |
26 | PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" | 26 | PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" |
27 | PACKAGECONFIG_remove_libc-musl = "lttng-ust" | 27 | PACKAGECONFIG_remove_libc-musl = "lttng-ust" |
28 | PACKAGECONFIG_remove_riscv64 = "lttng-ust" | 28 | PACKAGECONFIG_remove_riscv64 = "lttng-ust" |
@@ -30,12 +30,11 @@ PACKAGECONFIG_remove_riscv64 = "lttng-ust" | |||
30 | SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ | 30 | SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ |
31 | file://x32.patch \ | 31 | file://x32.patch \ |
32 | file://run-ptest \ | 32 | file://run-ptest \ |
33 | file://0001-Allow-multiple-attempts-to-connect-to-relayd.patch \ | ||
34 | file://lttng-sessiond.service \ | 33 | file://lttng-sessiond.service \ |
35 | " | 34 | " |
36 | 35 | ||
37 | SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96" | 36 | SRC_URI[md5sum] = "50e07676d5eb5d6cf4ece804863a6f74" |
38 | SRC_URI[sha256sum] = "77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c" | 37 | SRC_URI[sha256sum] = "a4868078ef961e83dc236c4f24fd848161bfa755344b064dece62c4c81a07411" |
39 | 38 | ||
40 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd | 39 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd |
41 | 40 | ||
@@ -91,6 +90,20 @@ do_install_ptest () { | |||
91 | install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" | 90 | install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" |
92 | done | 91 | done |
93 | 92 | ||
93 | for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do | ||
94 | for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do | ||
95 | cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f | ||
96 | case $f in | ||
97 | *.so) | ||
98 | install -d ${D}${PTEST_PATH}/tests/$d/ | ||
99 | ln -s ../$f ${D}${PTEST_PATH}/tests/$d/$f | ||
100 | ;; | ||
101 | esac | ||
102 | done | ||
103 | done | ||
104 | |||
105 | install ${B}/tests/unit/ini_config/sample.ini ${D}${PTEST_PATH}/tests/unit/ini_config/ | ||
106 | |||
94 | # We shouldn't need to build anything in tests/regression/tools | 107 | # We shouldn't need to build anything in tests/regression/tools |
95 | sed -i -e 's!^SUBDIRS = tools !SUBDIRS = !' \ | 108 | sed -i -e 's!^SUBDIRS = tools !SUBDIRS = !' \ |
96 | "${D}${PTEST_PATH}/tests/regression/Makefile" | 109 | "${D}${PTEST_PATH}/tests/regression/Makefile" |
@@ -118,6 +131,15 @@ do_install_ptest () { | |||
118 | find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ | 131 | find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ |
119 | touch -r "${B}/Makefile" {} + | 132 | touch -r "${B}/Makefile" {} + |
120 | 133 | ||
134 | # | ||
135 | # Need to stop generated binaries from rebuilding by removing their source dependencies | ||
136 | # | ||
137 | sed -e 's#\(^test.*OBJECTS.=\)#disable\1#g' \ | ||
138 | -e 's#\(^test.*DEPENDENCIES.=\)#disable\1#g' \ | ||
139 | -e 's#\(^test.*SOURCES.=\)#disable\1#g' \ | ||
140 | -e 's#\(^test.*LDADD.=\)#disable\1#g' \ | ||
141 | -i ${D}${PTEST_PATH}/tests/unit/Makefile | ||
142 | |||
121 | # Substitute links to installed binaries. | 143 | # Substitute links to installed binaries. |
122 | for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do | 144 | for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do |
123 | exedir="${D}${PTEST_PATH}/src/bin/${prog}" | 145 | exedir="${D}${PTEST_PATH}/src/bin/${prog}" |