summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-09-18 21:28:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 10:54:32 +0100
commitf700a98f20b261207c40fbcc7bdcb83e154b9534 (patch)
tree9845de969581d303080e92d4dd05c1d58163109b /meta/recipes-kernel/lttng
parentc2f785f716c1add14252f22f50e0b6f4ddca3851 (diff)
downloadpoky-f700a98f20b261207c40fbcc7bdcb83e154b9534.tar.gz
lttng-ust: Upgrade 2.10.4 -> 2.10.5
Remove patch for issue fixed upstream. (From OE-Core rev: 1c8201da33174368fe7143047147d7c5aab0d224) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch57
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb)5
2 files changed, 2 insertions, 60 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch
deleted file mode 100644
index 15db1d3af7..0000000000
--- a/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 2bb3e259d0410f16a8b2058a05af434376a1583a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 26 Jul 2019 09:57:32 -0700
4Subject: [lttng-ust][PATCH] Add config time check for new gettid API
5
6glibc 2.30 introdoced this function see [1]
7so its best to detect it
8and provide fallbacks only if its not present
9
10[1] https://sourceware.org/bugzilla/show_bug.cgi?id=6399
11
12Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2019-July/029131.html]
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 configure.ac | 1 +
17 include/lttng/ust-tid.h | 7 +++++--
18 2 files changed, 6 insertions(+), 2 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 7fa059a..b1099c1 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -137,6 +137,7 @@ AC_CHECK_FUNCS([ \
25 clock_gettime \
26 ftruncate \
27 getpagesize \
28+ gettid \
29 gettimeofday \
30 localeconv \
31 memchr \
32diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h
33index e669d7e..7995c78 100644
34--- a/include/lttng/ust-tid.h
35+++ b/include/lttng/ust-tid.h
36@@ -26,7 +26,10 @@
37 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
38 * SOFTWARE.
39 */
40-
41+#include <config.h>
42+#if HAVE_GETTID
43+#include <unistd.h>
44+#else
45 #ifdef __linux__
46 #include <syscall.h>
47 #endif
48@@ -49,5 +52,5 @@ static inline pid_t gettid(void)
49 return getpid();
50 }
51 #endif
52-
53+#endif /* HAVE_GETTID */
54 #endif /* _LTTNG_UST_TID_H */
55--
562.22.0
57
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb b/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
index 861a05e6a8..e8312afb26 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
@@ -27,11 +27,10 @@ PE = "2"
27 27
28SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ 28SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
29 file://lttng-ust-doc-examples-disable.patch \ 29 file://lttng-ust-doc-examples-disable.patch \
30 file://0001-Add-config-time-check-for-new-gettid-API.patch \
31 " 30 "
32 31
33SRC_URI[md5sum] = "19916ff0dec23c90f985586a8cbd1fd2" 32SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c"
34SRC_URI[sha256sum] = "75d5b4bb205c444a343e1297e14cd3a2503fc645a26710531cbd319c72c1a967" 33SRC_URI[sha256sum] = "06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35"
35 34
36CVE_PRODUCT = "ust" 35CVE_PRODUCT = "ust"
37 36