From feb628adb03c6df435753a1dc84a336ff7ff9ec8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 Sep 2026 22:26:50 +0200 Subject: [PATCH] package/lttng-tools: remove unneeded patch Upstream added the configure option --enable-tests with commit https://github.com/lttng/lttng-tools/commit/6ba949601d077c90e736fcce4e722487c56a09cb which was first released in version 2.15.0. While bumping the package from 2.14.0 to 2.16.0 with buildroot commit edd3a015cd90441291d2b5513c71e2eabf682e24 this new option was not taken into consideration. We can therefore now remove our own patch to implement this configure option. Renumbered remaining patch. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...nel-memory-types.hpp-fails-to-build.patch} | 0 .../0001-configure.ac-add-disable-tests.patch | 38 ------------------- package/lttng-tools/lttng-tools.mk | 2 - 3 files changed, 40 deletions(-) rename package/lttng-tools/{0002-Fix-sessiond-channel-memory-types.hpp-fails-to-build.patch => 0001-Fix-sessiond-channel-memory-types.hpp-fails-to-build.patch} (100%) delete mode 100644 package/lttng-tools/0001-configure.ac-add-disable-tests.patch diff --git a/package/lttng-tools/0002-Fix-sessiond-channel-memory-types.hpp-fails-to-build.patch b/package/lttng-tools/0001-Fix-sessiond-channel-memory-types.hpp-fails-to-build.patch similarity index 100% rename from package/lttng-tools/0002-Fix-sessiond-channel-memory-types.hpp-fails-to-build.patch rename to package/lttng-tools/0001-Fix-sessiond-channel-memory-types.hpp-fails-to-build.patch diff --git a/package/lttng-tools/0001-configure.ac-add-disable-tests.patch b/package/lttng-tools/0001-configure.ac-add-disable-tests.patch deleted file mode 100644 index bdf621b4ec..0000000000 --- a/package/lttng-tools/0001-configure.ac-add-disable-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8c3a5d0921090e2fc3c4e2561509d23eb9ffa6dd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 2 Apr 2021 21:07:07 +0200 -Subject: [PATCH] configure.ac: add --disable-tests - -Allow the user to explicitly disable tests - -Upstream: https://github.com/lttng/lttng-tools/pull/162 (rejected) - -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 04f9cef4..372cdf3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -862,6 +862,8 @@ AC_ARG_ENABLE([bin-lttng-sessiond], AS_HELP_STRING([--disable-bin-lttng-sessiond - [Disable the build of lttng-sessiond binaries])) - AC_ARG_ENABLE([extras], AS_HELP_STRING([--disable-extras], - [Disable the build of the extra components])) -+AC_ARG_ENABLE([tests], AS_HELP_STRING([--disable-tests], -+ [Disable the build of the test components])) - - - build_lib_consumer=no -@@ -1013,6 +1015,7 @@ AM_CONDITIONAL([BUILD_BIN_LTTNG_SESSIOND], [test x$enable_bin_lttng_sessiond != - - # Export the tests and extras build conditions. - AS_IF([\ -+test "x$enable_tests" != "xno" && \ - test "x$enable_bin_lttng" != "xno" && \ - test "x$enable_bin_lttng_consumerd" != "xno" && \ - test "x$enable_bin_lttng_crash" != "xno" && \ --- -2.30.2 - diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 6f6cdedb43..e2eaed5824 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -17,8 +17,6 @@ LTTNG_TOOLS_LICENSE_FILES = \ LICENSES/LGPL-2.1-only.txt \ LICENSES/MIT.txt LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux -# We're patching configure.ac -LTTNG_TOOLS_AUTORECONF = YES LTTNG_TOOLS_CONF_OPTS = \ --disable-man-pages \ --disable-tests \