Browse Source

package/lttng-libust: bump to version 2.14.0

The changelog for lttng-libust 2.14.0 can be found here:

  https://git.lttng.org/?p=lttng-ust.git;a=blob;f=ChangeLog;h=1ddf7956cd80674f8bb0cec4b9362a9b1bf943b4;hb=refs/heads/stable-2.14

Rebased patch 0001 due to upstream commit:

   https://git.lttng.org/?p=lttng-ust.git;a=commitdiff;h=464c475658ae29039b3b9e769b5b02195688a94a

Updated license files and hashes due to upstream commit:

   https://git.lttng.org/?p=lttng-ust.git;a=commit;h=e03d7c66c57bf268b87296566a5160039f35ccfb

Added dependency to host-python-setuptools due to upstream commit:

   https://git.lttng.org/?p=lttng-ust.git;a=commitdiff;h=cb80e2fb106d56b4a0ae9c0480a368572f4d0d35

Signed-off-by: Devin Steffler <devin.buildroot@gmail.com>
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Bernd:
 - bumped to 2.14.0, updated link to changelog
 - numerous fixes]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Devin Steffler 1 month ago
parent
commit
7060cc01f1

+ 6 - 4
package/lttng-libust/0001-configure.ac-add-disable-tests.patch

@@ -7,6 +7,8 @@ Add configure option to disable tests.
 Upstream is not likely to accept it, see lttng-tools package.
 
 Signed-off-by: Norbert Lange <nolange79@gmail.com>
+[Bernd: rebased for version 2.14.0]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  Makefile.am  | 5 ++++-
  configure.ac | 6 ++++++
@@ -16,7 +18,7 @@ diff --git a/Makefile.am b/Makefile.am
 index 9ab93ccd..8a1c1dca 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -7,9 +7,12 @@ SUBDIRS = \
+@@ -9,9 +9,12 @@ SUBDIRS = \
  	src \
  	tools \
  	doc \
@@ -34,7 +36,7 @@ diff --git a/configure.ac b/configure.ac
 index b6254228..fe5f2700 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -360,6 +360,11 @@ AE_FEATURE([python-agent],[build the LTTng UST Python agent])
+@@ -371,6 +371,11 @@ AE_FEATURE([python-agent],[build the LTTng UST Python agent])
  AE_FEATURE_DEFAULT_ENABLE
  AE_FEATURE([examples],[Do not build and install examples])
  
@@ -46,13 +48,13 @@ index b6254228..fe5f2700 100644
  # Man pages
  # Enabled by default
  AE_FEATURE_DEFAULT_ENABLE
-@@ -525,6 +530,7 @@ AC_DEFINE([LTTNG_UST_CTL_LIB_SONAME_MAJOR], [ust_ctl_lib_version_current], [Majo
+@@ -565,6 +570,7 @@ AC_DEFINE([LTTNG_UST_CTL_LIB_SONAME_MAJOR], [ust_ctl_lib_version_current], [Majo
  ##                                                                          ##
  
  AM_CONDITIONAL([ENABLE_EXAMPLES], AE_IS_FEATURE_ENABLED([examples]))
 +AM_CONDITIONAL([ENABLE_TESTS], AE_IS_FEATURE_ENABLED([tests]))
  AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$PYTHON" != "x"])
- AM_CONDITIONAL([ENABLE_JAVA_AGENT], AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j]))
+ AM_CONDITIONAL([ENABLE_JAVA_AGENT], AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j]) || AE_IS_FEATURE_ENABLED([java-agent-log4j2]))
  AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_JUL], AE_IS_FEATURE_ENABLED([java-agent-jul]))
 -- 
 2.34.1

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

@@ -1,9 +1,9 @@
-# From https://lttng.org/files/lttng-ust/lttng-ust-2.13.2.tar.bz2.sha256
-sha256  5667bf0269e1e62e2d9cb974c456ff86e0401bd7aa3bfc8d5fdb97233249eddc  lttng-ust-2.13.1.tar.bz2
+# From https://lttng.org/files/lttng-ust/lttng-ust-2.14.0.tar.bz2.sha256
+sha256  82cdfd304bbb2b2b7d17cc951a6756b37a9f73868ec0ba7db448a0d5ca51b763  lttng-ust-2.14.0.tar.bz2
 
 # Hash for license files
-sha256  5b52242fd2045d62dd664c8358137b46c1e08efdba674c91cbfc06585efe1ce7  LICENSE
-sha256  f206ce02ddf94d03120b58381064702729a0e6cbb03cafc84dc0e434ce5689fa  LICENSES/BSD-3-Clause
-sha256  6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62  LICENSES/GPL-2.0
-sha256  d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c  LICENSES/LGPL-2.1
-sha256  323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f  LICENSES/MIT
+sha256  5a93d5831e1297ab10fe643e1a631e83be392896da14ee2951285a79012df69d  LICENSES/BSD-3-Clause.txt
+sha256  aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3  LICENSES/GPL-2.0-or-later.txt
+sha256  fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb  LICENSES/LGPL-2.1-or-later.txt
+sha256  b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0  LICENSES/MIT.txt
+sha256  4b432d14b8f0b85489a784a5ff9d0ccd8a265def548b0794e22ea5ff5e8dd910  LICENSE

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

@@ -5,10 +5,15 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.13.1
+LTTNG_LIBUST_VERSION = 2.14.0
 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), BSD-3-Clause (snprintf)
-LTTNG_LIBUST_LICENSE_FILES = LICENSE LICENSES/BSD-3-Clause LICENSES/GPL-2.0 LICENSES/LGPL-2.1 LICENSES/MIT
+LTTNG_LIBUST_LICENSE_FILES = \
+	LICENSES/BSD-3-Clause.txt \
+	LICENSES/GPL-2.0-or-later.txt \
+	LICENSES/LGPL-2.1-or-later.txt \
+	LICENSES/MIT.txt \
+	LICENSE
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
 LTTNG_LIBUST_CONF_OPTS = \
@@ -21,7 +26,7 @@ LTTNG_LIBUST_AUTORECONF = YES
 LTTNG_LIBUST_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DUATOMIC_NO_LINK_ERROR"
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
-LTTNG_LIBUST_DEPENDENCIES += python3
+LTTNG_LIBUST_DEPENDENCIES += python3 host-python-setuptools
 LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
 else
 LTTNG_LIBUST_CONF_ENV += am_cv_pathless_PYTHON="none"