package/lttng-tools: bump version to 2.12.3

PATCH New Norbert Lange 3 participants 7 messages Feb 24, 2021 – Mar 17, 2021

lore

Share & tools

lore

Norbert Lange

author

2021-02-24 10:31 UTC #0 lore raw

PATCH 1/4 package/lttng-tools: bump version to 2.12.3

Remove patch 001 as it has been fixed upstream.

Signed-off-by Norbert Lange <[email protected]>

---
 ...nts-ns-tp.h-Fix-build-with-musl-libc.patch | 46 -------------------
 package/lttng-tools/lttng-tools.hash          |  4 +-
 package/lttng-tools/lttng-tools.mk            |  2 +-
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch

package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch deleted +0 ~~-46~~

deleted file mode 100644
index e3e0f3a777..0000000000
@@ -1,46 +0,0 @@
-From 73f906d4d6806afb1962751ccb0fe6c15f320d94 Mon Sep 17 00:00:00 2001
-From: Ovidiu Panait <[email protected]>
-Date: Mon, 18 May 2020 16:39:26 +0300
-Subject: [PATCH] tests: gen-ust-events-ns/tp.h: Fix build with musl libc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix the following build error with musl libc:
-In file included from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:14,
-                 from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.c:10:
-../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
-   17 |  TP_ARGS(ino_t, ns_ino),
-      |          ^~~~~
-../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
-   17 |  TP_ARGS(ino_t, ns_ino),
-      |          ^~~~~
-../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
-   17 |  TP_ARGS(ino_t, ns_ino),
-      |  ^~~~~~~
-../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
-   17 |  TP_ARGS(ino_t, ns_ino),
-      |  ^~~~~~~
-
-Signed-off-by: Ovidiu Panait <[email protected]>
-Signed-off-by: J?r?mie Galarneau <[email protected]>
-Change-Id: Ic7a73c6754fc30a62bdf6519062c07be65a2eaba
-[Retrieved from:
-https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94]
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- tests/utils/testapp/gen-ust-events-ns/tp.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h
-index 4dbfed51a..e0ddb29a6 100644
---- a/tests/utils/testapp/gen-ust-events-ns/tp.h
-+++ b/tests/utils/testapp/gen-ust-events-ns/tp.h
-@@ -11,6 +11,7 @@
- #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
- #define _TRACEPOINT_TP_H
- 
-+#include <sys/types.h>
- #include <lttng/tracepoint.h>
- 
- TRACEPOINT_EVENT(tp, tptest,

package/lttng-tools/lttng-tools.hash +2 -2

index a27b419e75..a94ecc4a35 100644
@@ -1,5 +1,5 @@
-# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.1.tar.bz2.sha256
-sha256  0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8  lttng-tools-2.12.1.tar.bz2
+# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.3.tar.bz2.sha256
+sha256  2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153  lttng-tools-2.12.3.tar.bz2
 
 # Locally computed
 sha256  068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5  LICENSE

package/lttng-tools/lttng-tools.mk +1 -1

index e0e99e3270..d66233414e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_TOOLS_VERSION = 2.12.1
+LTTNG_TOOLS_VERSION = 2.12.3
 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.30.0

Norbert Lange

author

2021-02-24 10:31 UTC #1 lore raw

PATCH 2/4 package/lttng-libust: bump to version 2.12.1

Signed-off-by Norbert Lange <[email protected]>

---
 package/lttng-libust/lttng-libust.hash | 4 ++--
 package/lttng-libust/lttng-libust.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/lttng-libust/lttng-libust.hash +2 -2

index 62a65897f4..40bd870e86 100644
@@ -1,5 +1,5 @@
-# From https://lttng.org/files/lttng-ust/lttng-ust-2.12.0.tar.bz2.sha256
-sha256  1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528  lttng-ust-2.12.0.tar.bz2
+# From https://lttng.org/files/lttng-ust/lttng-ust-2.12.1.tar.bz2.sha256
+sha256  48a3948b168195123a749d22818809bd25127bb5f1a66458c3c012b210d2a051  lttng-ust-2.12.1.tar.bz2
 
 # Hash for license file
 sha256  74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e  COPYING

package/lttng-libust/lttng-libust.mk +1 -1

index f3c660c56f..69dc4473f0 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.12.0
+LTTNG_LIBUST_VERSION = 2.12.1
 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.30.0

Norbert Lange

author

2021-02-24 10:31 UTC #2 lore raw

PATCH 3/4 package/lttng-libust: set rundir to /run/lttng unconditionally

In reply to Norbert Lange

Buildroot ensures that all init-systems have a /run directory, this should be the preferred location.

Signed-off-by Norbert Lange <[email protected]>

---
 package/lttng-libust/lttng-libust.mk | 3 ---
 1 file changed, 3 deletions(-)

package/lttng-libust/lttng-libust.mk +0 -3

index 69dc4473f0..66134fc53c 100644
@@ -12,10 +12,7 @@ LTTNG_LIBUST_LICENSE_FILES = COPYING
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
 LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples
-
-ifeq ($(BR2_INIT_SYSTEMD),y)
 LTTNG_LIBUST_CONF_OPTS += --with-lttng-system-rundir=/run/lttng
-endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 LTTNG_LIBUST_DEPENDENCIES += python

Signature · 1 line

2.30.0

Peter Korsgaard

2021-03-17 19:11 UTC #3 lore raw

PATCH 3/4 package/lttng-libust: set rundir to /run/lttng unconditionally

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Norbert" == Norbert Lange <[email protected]> writes:
Buildroot ensures that all init-systems have a /run directory, this should be the preferred location.
Signed-off-by Norbert Lange <[email protected]>

Committed to 2021.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Norbert Lange

author

2021-02-24 10:31 UTC #4 lore raw

PATCH 4/4 package/lttng-tools: set rundir to /run/lttng unconditionally

In reply to Norbert Lange

Buildroot ensures that all init-systems have a /run directory, this should be the preferred location.

Signed-off-by Norbert Lange <[email protected]>

---
 package/lttng-tools/lttng-tools.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

package/lttng-tools/lttng-tools.mk +1 -4

index d66233414e..b876b11650 100644
@@ -10,12 +10,9 @@ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 LTTNG_TOOLS_INSTALL_STAGING = YES
 LTTNG_TOOLS_LICENSE = GPL-2.0, LGPL-2.1 (include/lttng/*, src/lib/lttng-ctl/*)
 LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Clause GPL-2.0 LGPL-2.1 MIT)
-LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
 LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
-
-ifeq ($(BR2_INIT_SYSTEMD),y)
+LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
 LTTNG_TOOLS_CONF_OPTS += --with-lttng-system-rundir=/run/lttng
-endif
 
 ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
 LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust

Signature · 1 line

2.30.0

Peter Korsgaard

2021-03-17 19:11 UTC #5 lore raw

PATCH 4/4 package/lttng-tools: set rundir to /run/lttng unconditionally

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Norbert" == Norbert Lange <[email protected]> writes:
Buildroot ensures that all init-systems have a /run directory, this should be the preferred location.
Signed-off-by Norbert Lange <[email protected]>

Committed to 2021.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

2021-03-06 22:28 UTC #6 lore raw

PATCH 1/4 package/lttng-tools: bump version to 2.12.3

In reply to Norbert Lange

Quoted 9 lines · On Wed, 24 Feb 2021 11:31:50 +0100 Norbert Lange <[email protected]> wrote:

Remove patch 001 as it has been fixed upstream.

Signed-off-by Norbert Lange <[email protected]>

---
 ...nts-ns-tp.h-Fix-build-with-musl-libc.patch | 46 -------------------
 package/lttng-tools/lttng-tools.hash          |  4 +-
 package/lttng-tools/lttng-tools.mk            |  2 +-
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch

Series applied to next. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com