diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2019-09-18 21:28:01 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-19 10:54:26 +0100 |
| commit | 1c8201da33174368fe7143047147d7c5aab0d224 (patch) | |
| tree | 72537b80cbe2da53ce626e6d95395dee717c7811 | |
| parent | daf55a989c8bb4a559d75c30ed85b135ec14d5fd (diff) | |
| download | openembedded-core-1c8201da33174368fe7143047147d7c5aab0d224.tar.gz | |
lttng-ust: Upgrade 2.10.4 -> 2.10.5
Remove patch for issue fixed upstream.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch | 57 | ||||
| -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 @@ -From 2bb3e259d0410f16a8b2058a05af434376a1583a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 26 Jul 2019 09:57:32 -0700 -Subject: [lttng-ust][PATCH] Add config time check for new gettid API - -glibc 2.30 introdoced this function see [1] -so its best to detect it -and provide fallbacks only if its not present - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=6399 - -Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2019-July/029131.html] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 + - include/lttng/ust-tid.h | 7 +++++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7fa059a..b1099c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,6 +137,7 @@ AC_CHECK_FUNCS([ \ - clock_gettime \ - ftruncate \ - getpagesize \ -+ gettid \ - gettimeofday \ - localeconv \ - memchr \ -diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h -index e669d7e..7995c78 100644 ---- a/include/lttng/ust-tid.h -+++ b/include/lttng/ust-tid.h -@@ -26,7 +26,10 @@ - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -- -+#include <config.h> -+#if HAVE_GETTID -+#include <unistd.h> -+#else - #ifdef __linux__ - #include <syscall.h> - #endif -@@ -49,5 +52,5 @@ static inline pid_t gettid(void) - return getpid(); - } - #endif -- -+#endif /* HAVE_GETTID */ - #endif /* _LTTNG_UST_TID_H */ --- -2.22.0 - 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" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://lttng-ust-doc-examples-disable.patch \ - file://0001-Add-config-time-check-for-new-gettid-API.patch \ " -SRC_URI[md5sum] = "19916ff0dec23c90f985586a8cbd1fd2" -SRC_URI[sha256sum] = "75d5b4bb205c444a343e1297e14cd3a2503fc645a26710531cbd319c72c1a967" +SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c" +SRC_URI[sha256sum] = "06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35" CVE_PRODUCT = "ust" |