Skip to contentSkip to conversation

lttng-tools: bump version to 2.9.0

PATCH New Vicente Olivert Riera 3 participants 8 messages Nov 30, 2016 – Dec 3, 2016

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH 1/4 lttng-tools: bump version to 2.9.0

Drop sha256 hash. The combination of md5 and sha1 hashes is enough.

Remove upstream patches:

- 0001-Fix-snapshot-del-output-with-name-on-musl.patch
https://github.com/lttng/lttng-tools/commit/07f5023712313d73ab3feac62390a2d50457b7aa

- 0002-Fix-strerror_r-behavior-is-glibc-specific.patch
https://github.com/lttng/lttng-tools/commit/b6dacfe27a91af50a1f81a2a7eadf4f34ca75769

- 0003-Set-thread-stack-size-to-ulimit-soft-value.patch
https://github.com/lttng/lttng-tools/commit/1a1a34b40ab10a195633b1ed5e2e9b42fdae0a78

Release notes:
https://lists.lttng.org/pipermail/lttng-dev/2016-November/026763.html

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 ...Fix-snapshot-del-output-with-name-on-musl.patch |  32 --
 ...Fix-strerror_r-behavior-is-glibc-specific.patch |  30 --
 ...et-thread-stack-size-to-ulimit-soft-value.patch | 431 ---------------------
 package/lttng-tools/lttng-tools.hash               |   9 +-
 package/lttng-tools/lttng-tools.mk                 |   2 +-
 5 files changed, 4 insertions(+), 500 deletions(-)
 delete mode 100644 package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch
 delete mode 100644 package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch
 delete mode 100644 package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch
package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch deleted +0 -32
deleted file mode 100644
index 102a02b..0000000
@@ -1,32 +0,0 @@
-From: mjeanson at efficios.com Michael Jeanson
-Date: Wed, 15 Jun 2016 17:18:02 -0400
-Subject: [lttng-dev] [PATCH] Fix: snapshot del-output with name on musl
-
-Some implementations of strtol() like the one in musl will
-return EINVAL in perror when no valid number was found in
-the string.
-
-Signed-off-by: Michael Jeanson <[email protected]>
-[Philippe: grabbed from the mailing list:
-    https://lists.lttng.org/pipermail/lttng-dev/2016-June/026192.html
- and adapted to 2.8.2.]
-Signed-off-by: Philippe Proulx <[email protected]>
----
- src/bin/lttng/commands/snapshot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
-index d948226..00aa5b7 100644
---- a/src/bin/lttng/commands/snapshot.c
-+++ b/src/bin/lttng/commands/snapshot.c
-@@ -447,7 +447,7 @@ static int cmd_del_output(int argc, const char **argv)
-
- 	errno = 0;
- 	id = strtol(argv[1], &name, 10);
--	if (id == 0 && errno == 0) {
-+	if (id == 0 && (errno == 0 || errno == EINVAL)) {
- 		if (lttng_opt_mi) {
- 			ret = mi_del_output(UINT32_MAX, name);
- 		} else {
---
-2.7.4
package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch deleted +0 -30
deleted file mode 100644
index e9ba74f..0000000
@@ -1,30 +0,0 @@
-From fc743b22fc26eab9f9dbf48e4505ed2394924bba Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <[email protected]>
-Date: Mon, 13 Jun 2016 18:44:17 -0400
-Subject: [PATCH lttng-tools] Fix: strerror_r behavior is glibc specific
-
-Signed-off-by: Michael Jeanson <[email protected]>
-[Philippe: grabbed from the mailing list:
-    https://lists.lttng.org/pipermail/lttng-dev/2016-June/026194.html
-]
-Signed-off-by: Philippe Proulx <[email protected]>
----
- src/common/error.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/common/error.h b/src/common/error.h
-index 0fbd3a2..e8c811e 100644
---- a/src/common/error.h
-+++ b/src/common/error.h
-@@ -198,7 +198,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
- 
- #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args)
- 
--#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
-+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
- 
- /*
-  * Version using XSI strerror_r.
--- 
-2.7.4
-
package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch deleted +0 -431

431 lines not on this page · raw message

package/lttng-tools/lttng-tools.hash +3 -6
index 267da80..729ccf2 100644
@@ -1,6 +1,3 @@
-# From http://lttng.org/files/lttng-tools/lttng-tools-2.8.2.tar.bz2.{md5,sha1}
-md5     cac8d64111711ae1b632d0dc12fe92c1  lttng-tools-2.8.2.tar.bz2
-sha1    870874ba9644691de8e564a1fa1459aa5fef42ba  lttng-tools-2.8.2.tar.bz2
-
-# Locally generated
-sha256  a07e00e9519dad2577d9330bcaf040ab3dc1b289fbcb8c702c39d520422e7565  lttng-tools-2.8.2.tar.bz2
+# From http://lttng.org/files/lttng-tools/lttng-tools-2.9.0.tar.bz2.{md5,sha1}
+md5 75b5feb18aa2a136ebf70a14d2a5a6e5  lttng-tools-2.9.0.tar.bz2
+sha1 299158fd8614e45ee596d793696feb86cdea34b2  lttng-tools-2.9.0.tar.bz2
package/lttng-tools/lttng-tools.mk +1 -1
index 0591633..66ac687 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_TOOLS_VERSION = 2.8.2
+LTTNG_TOOLS_VERSION = 2.9.0
 LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
 LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 LTTNG_TOOLS_LICENSE = GPLv2+, LGPLv2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
Signature · 1 line
2.10.1
author
#1 lore raw

PATCH 2/4 lttng-modules: bump version to 2.9.0

Release notes:
https://lists.lttng.org/pipermail/lttng-dev/2016-November/026760.html

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/lttng-modules/lttng-modules.hash | 6 +++---
 package/lttng-modules/lttng-modules.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
package/lttng-modules/lttng-modules.hash +3 -3
index ce725ec..d8314f6 100644
@@ -1,3 +1,3 @@
-# From http://lttng.org/files/lttng-modules/lttng-modules-2.8.3.tar.bz2.{md5,sha1}
-md5   424354c4834d20235dacd9a1fd7653b6  lttng-modules-2.8.3.tar.bz2
-sha1  862705784a54962f70226004f1fd0bf77f73f10f  lttng-modules-2.8.3.tar.bz2
+# From http://lttng.org/files/lttng-modules/lttng-modules-2.9.0.tar.bz2.{md5,sha1}
+md5 717df375ccb6f32bb297cc2f2e692bbf  lttng-modules-2.9.0.tar.bz2
+sha1 819ee1c2a5a821b7fdc1c2fc102ef3079c32aad7  lttng-modules-2.9.0.tar.bz2
package/lttng-modules/lttng-modules.mk +1 -1
index 9ecf572..aa0ac30 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.8.3
+LTTNG_MODULES_VERSION = 2.9.0
 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
 LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
Signature · 1 line
2.10.1
author
#2 lore raw

PATCH 3/4 lttng-babeltrace: bump version to 1.5.0

In reply to Vicente Olivert Riera

Drop sha256 hash. The combination of md5 and sha1 hashes is enough.

Release notes:
https://lists.lttng.org/pipermail/lttng-dev/2016-November/026762.html

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/lttng-babeltrace/lttng-babeltrace.hash | 9 +++------
 package/lttng-babeltrace/lttng-babeltrace.mk   | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)
package/lttng-babeltrace/lttng-babeltrace.hash +3 -6
index bca0bdb..7f91b8b 100644
@@ -1,6 +1,3 @@
-# From http://www.efficios.com/files/babeltrace/babeltrace-1.4.0.tar.bz2.{md5,sha1}
-md5     fa99064048af5c9c6ff00e489ac809c2  babeltrace-1.4.0.tar.bz2
-sha1    3b162480ee883625e8581bf163817f78a4b6487b  babeltrace-1.4.0.tar.bz2
-
-# Locally generated
-sha256  9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4  babeltrace-1.4.0.tar.bz2
+# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.0.tar.bz2.{md5,sha1}
+md5 43696383e44d1b85173db7cbd0335f06  babeltrace-1.5.0.tar.bz2
+sha1 13f106951c418632a2155ebe3cea51fa4929e748  babeltrace-1.5.0.tar.bz2
package/lttng-babeltrace/lttng-babeltrace.mk +1 -1
index 59327db..7d4b520 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace
-LTTNG_BABELTRACE_VERSION = 1.4.0
+LTTNG_BABELTRACE_VERSION = 1.5.0
 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code)
 LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
Signature · 1 line
2.10.1
#3 lore raw

PATCH 3/4 lttng-babeltrace: bump version to 1.5.0

Hello,

Quoted 10 lines · Vicente Olivert Riera

Drop sha256 hash. The combination of md5 and sha1 hashes is enough.

Release notes:
https://lists.lttng.org/pipermail/lttng-dev/2016-November/026762.html

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/lttng-babeltrace/lttng-babeltrace.hash | 9 +++------
 package/lttng-babeltrace/lttng-babeltrace.mk   | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

This was apparently not tested at all: one of the patches fails to apply, see
http://autobuild.buildroot.net/results/98a/98a42516fa7e2c79e5529d1b5a8d44fcd60934c7/build-end.log.

Could you have a look?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#4 lore raw

PATCH 4/4 lttng-libust: bump version to 2.9.0

In reply to Vicente Olivert Riera

Drop sha256 hash. The combination of md5 and sha1 hashes is enough.

Add a patch that fixes a build failure due to using the compiler of the host machine. The patch has been submitted as a pull request:
https://github.com/lttng/lttng-ust/pull/41

Release notes:
https://lists.lttng.org/pipermail/lttng-dev/2016-November/026761.html

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 ...s-Makefile.am-define-C-and-C-compilers-fo.patch | 49 ++++++++++++++++++++++
 package/lttng-libust/lttng-libust.hash             |  9 ++--
 package/lttng-libust/lttng-libust.mk               |  2 +-
 3 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch new file +49 -0
new file mode 100644
index 0000000..5172dbb
@@ -0,0 +1,49 @@
+From f54894580da85e33f934c5c9bf5ab32d3fcce18b Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <[email protected]>
+Date: Wed, 30 Nov 2016 16:52:51 +0000
+Subject: [PATCH] doc/examples/Makefile.am: define C and C++ compilers for
+ CMake
+
+This prevents build failures when cross-compiling.
+
+If we don't define the compiler, it will use the one from the host
+machine. For instance "/usr/bin/c++", which is incorrect.
+
+The failure looks like this:
+
+.............................................................
+[ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o
+/usr/bin/c++   -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC   -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp
+In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0,
+                 from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32,
+                 from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26:
+/br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory
+ #include <urcu/compiler.h>
+                           ^
+compilation terminated.
+.............................................................
+
+Pull request URL: https://github.com/lttng/lttng-ust/pull/41
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+---
+ doc/examples/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
+index 424b844..5bc1f4c 100644
+--- a/doc/examples/Makefile.am
++++ b/doc/examples/Makefile.am
+@@ -152,7 +152,9 @@ all-local:
+ 				cmake \
+ 				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
+ 				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
++				-DCMAKE_C_COMPILER="$(CC)" \
+ 				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
++				-DCMAKE_CXX_COMPILER="$(CXX)" \
+ 				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
+ 				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+ 				.. && \
+-- 
+2.10.1
+
package/lttng-libust/lttng-libust.hash +3 -6
index a4a2907..e080361 100644
@@ -1,6 +1,3 @@
-# From http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2.{md5,sha1}
-md5     be505077245dc05f93370a565eec15f4  lttng-ust-2.8.1.tar.bz2
-sha1    8bebdcbcb453d2643fb226dbe92de61764f1ee3b  lttng-ust-2.8.1.tar.bz2
-
-# Locally generated
-sha256  6e41349107e83e7b43c69ed358e48788ca2fd095bad61737b850e3f3d2c0508a  lttng-ust-2.8.1.tar.bz2
+# From http://lttng.org/files/lttng-ust/lttng-ust-2.9.0.tar.bz2.{md5,sha1}
+md5 77f3378ba37a36801420bce87b702e9c  lttng-ust-2.9.0.tar.bz2
+sha1 9937eae64540821b8597cce081e92be76e6b5568  lttng-ust-2.9.0.tar.bz2
package/lttng-libust/lttng-libust.mk +1 -1
index 7a83f46..23cc745 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.8.1
+LTTNG_LIBUST_VERSION = 2.9.0
 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
 LTTNG_LIBUST_LICENSE_FILES = COPYING
Signature · 1 line
2.10.1
#5 lore raw

PATCH 1/4 lttng-tools: bump version to 2.9.0

In reply to Vicente Olivert Riera

Hi Vicente,

Quoted 1 line · Vicente Olivert Riera

Drop sha256 hash. The combination of md5 and sha1 hashes is enough.

I don't think so. Neither md5 nor sha1 is considered cryptographically secure. Their combination is probably better than either alone. But sha256 is even better. Not only because of its larger hash value, but also because the algorithm itself. Why drop it?

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#6 lore raw

PATCH 1/4 lttng-tools: bump version to 2.9.0

Hello,

Quoted 7 lines · Baruch Siach
Quoted 1 line · Vicente Olivert Riera

Drop sha256 hash. The combination of md5 and sha1 hashes is enough.

I don't think so. Neither md5 nor sha1 is considered cryptographically secure. Their combination is probably better than either alone. But sha256 is even better. Not only because of its larger hash value, but also because the algorithm itself. Why drop it?

We had a quick discussion on IRC, where Vicente asked about this, and both Peter and myself gave our feeling. Our feeling is that the combination of two "weak" hashes is good enough for what Buildroot uses hashes for. If no hash is provided by upstream or only one weak hash, then having a sha256 hash is what we prefer. But when there's already two "weak hashes" provided by upstream, we believe it's good enough.

Finding a collision is md5 is doable. Finding a collision in sha1 is harder, but apparently in the range of possible. But creating a collision that matches both is most likely really difficult to achieve.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#7 lore raw

PATCH 1/4 lttng-tools: bump version to 2.9.0

In reply to Vicente Olivert Riera

Hello,

Quoted 17 lines · Vicente Olivert Riera

Drop sha256 hash. The combination of md5 and sha1 hashes is enough.

Remove upstream patches:

- 0001-Fix-snapshot-del-output-with-name-on-musl.patch
https://github.com/lttng/lttng-tools/commit/07f5023712313d73ab3feac62390a2d50457b7aa

- 0002-Fix-strerror_r-behavior-is-glibc-specific.patch
https://github.com/lttng/lttng-tools/commit/b6dacfe27a91af50a1f81a2a7eadf4f34ca75769

- 0003-Set-thread-stack-size-to-ulimit-soft-value.patch
https://github.com/lttng/lttng-tools/commit/1a1a34b40ab10a195633b1ed5e2e9b42fdae0a78

Release notes:
https://lists.lttng.org/pipermail/lttng-dev/2016-November/026763.html

Signed-off-by Vicente Olivert Riera <[email protected]>
Quoted 10 lines
---
 ...Fix-snapshot-del-output-with-name-on-musl.patch |  32 --
 ...Fix-strerror_r-behavior-is-glibc-specific.patch |  30 --
 ...et-thread-stack-size-to-ulimit-soft-value.patch | 431 ---------------------
 package/lttng-tools/lttng-tools.hash               |   9 +-
 package/lttng-tools/lttng-tools.mk                 |   2 +-
 5 files changed, 4 insertions(+), 500 deletions(-)
 delete mode 100644 package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch
 delete mode 100644 package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch
 delete mode 100644 package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch

All four applied to next. For the last patch, I was worried that CMake might have been mandatory. But the configure script properly checks if cmake is available or not, and apparently acts properly if it's not available, so it looks good.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com