package/lttng-libust: bump to version 2.10.5
PATCH 1/3 package/lttng-libust: bump to version 2.10.5
- Remove second patch (already in version)
- Add hash for license file
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...002-Fix-namespace-our-gettid-wrapper.patch | 90 ------------------- package/lttng-libust/lttng-libust.hash | 8 +- package/lttng-libust/lttng-libust.mk | 2 +- 3 files changed, 6 insertions(+), 94 deletions(-) delete mode 100644 package/lttng-libust/0002-Fix-namespace-our-gettid-wrapper.patch
package/lttng-libust/0002-Fix-namespace-our-gettid-wrapper.patch deleted +0 -90
@@ -1,90 +0,0 @@ -From 3e2aaf78e6f8d57c7dbc42e39764862ba8c64bd7 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <[email protected]> -Date: Mon, 3 Jun 2019 15:25:32 -0400 -Subject: [PATCH] Fix: namespace our gettid wrapper - -Since glibc 2.30, a gettid wrapper was added that conflicts with our -static declaration. Namespace our wrapper so there is no conflict, -we'll add support for the glibc provided wrapper in a further commit. - -Signed-off-by: Michael Jeanson <[email protected]> -Signed-off-by: Mathieu Desnoyers <[email protected]> -[Retrieved from: -https://github.com/lttng/lttng-ust/commit/3e2aaf78e6f8d57c7dbc42e39764862ba8c64bd7] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - include/lttng/ust-tid.h | 12 +++++++----- - include/usterr-signal-safe.h | 2 +- - liblttng-ust/lttng-context-vtid.c | 4 ++-- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h -index e669d7e7..e637718a 100644 ---- a/include/lttng/ust-tid.h -+++ b/include/lttng/ust-tid.h -@@ -31,23 +31,25 @@ - #include <syscall.h> - #endif - --#if defined(_syscall0) --_syscall0(pid_t, gettid) --#elif defined(__NR_gettid) -+#if defined(__NR_gettid) -+ - #include <unistd.h> --static inline pid_t gettid(void) -+static inline pid_t lttng_gettid(void) - { - return syscall(__NR_gettid); - } -+ - #else -+ - #include <sys/types.h> - #include <unistd.h> - - /* Fall-back on getpid for tid if not available. */ --static inline pid_t gettid(void) -+static inline pid_t lttng_gettid(void) - { - return getpid(); - } -+ - #endif - - #endif /* _LTTNG_UST_TID_H */ -diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h -index 1df5ada0..d987c1f0 100644 ---- a/include/usterr-signal-safe.h -+++ b/include/usterr-signal-safe.h -@@ -95,7 +95,7 @@ do { \ - do { \ - sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n", \ - (long) getpid(), \ -- (long) gettid(), \ -+ (long) lttng_gettid(), \ - ## args, __func__); \ - } while(0) - -diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c -index f28e470a..2f721fa0 100644 ---- a/liblttng-ust/lttng-context-vtid.c -+++ b/liblttng-ust/lttng-context-vtid.c -@@ -62,7 +62,7 @@ void vtid_record(struct lttng_ctx_field *field, - struct lttng_channel *chan) - { - if (caa_unlikely(!URCU_TLS(cached_vtid))) -- URCU_TLS(cached_vtid) = gettid(); -+ URCU_TLS(cached_vtid) = lttng_gettid(); - lib_ring_buffer_align_ctx(ctx, lttng_alignof(URCU_TLS(cached_vtid))); - chan->ops->event_write(ctx, &URCU_TLS(cached_vtid), - sizeof(URCU_TLS(cached_vtid))); -@@ -73,7 +73,7 @@ void vtid_get_value(struct lttng_ctx_field *field, - struct lttng_ctx_value *value) - { - if (caa_unlikely(!URCU_TLS(cached_vtid))) -- URCU_TLS(cached_vtid) = gettid(); -+ URCU_TLS(cached_vtid) = lttng_gettid(); - value->u.s64 = URCU_TLS(cached_vtid); - } -
package/lttng-libust/lttng-libust.hash +5 -3
@@ -1,3 +1,5 @@ -# From http://lttng.org/files/lttng-ust/lttng-ust-2.10.1.tar.bz2.{md5,sha1} -md5 4863cc2f9f0a070b42438bb646bbba06 lttng-ust-2.10.1.tar.bz2 -sha1 3779c9ed75e3fa532797431f2c47979ce73614a7 lttng-ust-2.10.1.tar.bz2 +# From http://lttng.org/files/lttng-ust/lttng-ust-2.10.5.tar.bz2.sha256 +sha256 06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35 lttng-ust-2.10.5.tar.bz2 + +# Hash for license file +sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING
package/lttng-libust/lttng-libust.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.10.1 +LTTNG_LIBUST_VERSION = 2.10.5 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING
Signature · 1 line
2.23.0
PATCH 2/3 package/lttng-tools: bump to version 2.10.7
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/lttng-tools/lttng-tools.hash | 6 ++---- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
package/lttng-tools/lttng-tools.hash +2 -4
@@ -1,8 +1,6 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.10.5.tar.bz2.{md5,sha1} -md5 50e07676d5eb5d6cf4ece804863a6f74 lttng-tools-2.10.5.tar.bz2 -sha1 68790d44529a3b29896c35bb2350e8a0e1226264 lttng-tools-2.10.5.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.10.7.tar.bz2.sha256 +sha256 ed71ebe00c5d985c74f30e97b614e909573cbd9276c85e05d9557a0b817a1312 lttng-tools-2.10.7.tar.bz2 # Locally computed -sha256 a4868078ef961e83dc236c4f24fd848161bfa755344b064dece62c4c81a07411 lttng-tools-2.10.5.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt sha256 051be1f11b508ef7bb839994f6b58be19a827c56bd9bddfe36d77d3d4be55abe lgpl-2.1.txt sha256 f07515677547da5f3ee2396bdf491affc1accd5e4765a5378b6e1e98392fd5e7 LICENSE
package/lttng-tools/lttng-tools.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.10.5 +LTTNG_TOOLS_VERSION = 2.10.7 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES
Signature · 1 line
2.23.0
PATCH 3/3 package/lttng-modules: bump to version 2.10.11
In reply to Fabrice FontaineAdd hash for license files
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/lttng-modules/lttng-modules.hash | 11 ++++++++--- package/lttng-modules/lttng-modules.mk | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-)
package/lttng-modules/lttng-modules.hash +8 -3
@@ -1,3 +1,8 @@ -# From http://lttng.org/files/lttng-modules/lttng-modules-2.10.6.tar.bz2.{md5,sha1} -md5 8110099f4615fc89a74ffe9189b56cfc lttng-modules-2.10.6.tar.bz2 -sha1 1126b29e055ebdb3fad9201edaf0ef27f88c9369 lttng-modules-2.10.6.tar.bz2 +# From http://lttng.org/files/lttng-modules/lttng-modules-2.10.11.tar.bz2.sha256 +sha256 7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1 lttng-modules-2.10.11.tar.bz2 + +# Hash for license files +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 6334b377a5bd56b56a1e8a495830f2d28ed1b5cbedc7493aec9fba979efcdfe1 LICENSE
package/lttng-modules/lttng-modules.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.10.6 +LTTNG_MODULES_VERSION = 2.10.11 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
Signature · 1 line
2.23.0
PATCH 1/3 package/lttng-libust: bump to version 2.10.5
In reply to Fabrice FontaineQuoted 10 lines · On Sat, 28 Sep 2019 09:27:55 +0200 Fabrice Fontaine…
- Remove second patch (already in version)
- Add hash for license fileSigned-off-by Fabrice Fontaine <[email protected]>--- ...002-Fix-namespace-our-gettid-wrapper.patch | 90 ------------------- package/lttng-libust/lttng-libust.hash | 8 +- package/lttng-libust/lttng-libust.mk | 2 +- 3 files changed, 6 insertions(+), 94 deletions(-) delete mode 100644 package/lttng-libust/0002-Fix-namespace-our-gettid-wrapper.patch
All three applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com