diff options
| -rw-r--r-- | package/lttng-tools/Makefile | 9 | ||||
| -rw-r--r-- | package/lttng-tools/patches/patch-configure_ac | 19 | ||||
| -rw-r--r-- | package/lttng-tools/patches/patch-src_bin_lttng-sessiond_thread_c | 11 | ||||
| -rw-r--r-- | package/lttng-tools/patches/patch-src_common_fd-handle_c | 20 | ||||
| -rw-r--r-- | package/lttng-tools/patches/patch-src_common_shm_c | 20 |
5 files changed, 76 insertions, 3 deletions
diff --git a/package/lttng-tools/Makefile b/package/lttng-tools/Makefile index f3505fe55..fe9678212 100644 --- a/package/lttng-tools/Makefile +++ b/package/lttng-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lttng-tools -PKG_VERSION:= 2.9.5 +PKG_VERSION:= 2.13.11 PKG_RELEASE:= 1 -PKG_HASH:= 77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c +PKG_HASH:= ac5baeef9fa690936b1ca01ecd1742da762c2c08511ff1b4e923938d94d0f979 PKG_DESCR:= open source tracing framework PKG_SECTION:= app/debug PKG_BUILDDEP:= popt libxml2 util-linux userspace-rcu ncurses @@ -20,7 +20,10 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LTTNG_TOOLS,lttng-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -CONFIGURE_ARGS+= --without-lttng-ust +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --without-lttng-ust \ + --disable-tests \ + --disable-silent-rules lttng-tools-install: $(INSTALL_DIR) $(IDIR_LTTNG_TOOLS)/usr/bin diff --git a/package/lttng-tools/patches/patch-configure_ac b/package/lttng-tools/patches/patch-configure_ac new file mode 100644 index 000000000..fcde66d8b --- /dev/null +++ b/package/lttng-tools/patches/patch-configure_ac @@ -0,0 +1,19 @@ +--- lttng-tools-2.13.11.orig/configure.ac 2023-08-21 20:32:56.422853499 +0200 ++++ lttng-tools-2.13.11/configure.ac 2024-02-18 06:45:39.022802047 +0100 +@@ -884,6 +884,8 @@ AC_ARG_ENABLE([bin-lttng-sessiond], AS_H + [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 +@@ -1035,6 +1037,7 @@ AM_CONDITIONAL([BUILD_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" && \ diff --git a/package/lttng-tools/patches/patch-src_bin_lttng-sessiond_thread_c b/package/lttng-tools/patches/patch-src_bin_lttng-sessiond_thread_c new file mode 100644 index 000000000..53652ccf1 --- /dev/null +++ b/package/lttng-tools/patches/patch-src_bin_lttng-sessiond_thread_c @@ -0,0 +1,11 @@ +--- lttng-tools-2.13.11.orig/src/bin/lttng-sessiond/thread.c 2023-08-21 20:32:56.490852554 +0200 ++++ lttng-tools-2.13.11/src/bin/lttng-sessiond/thread.c 2024-02-18 06:55:46.482793807 +0100 +@@ -134,7 +134,7 @@ void lttng_thread_put(struct lttng_threa + if (!thread) { + return; + } +- assert(thread->ref.refcount); ++ //assert(thread->ref.refcount); + urcu_ref_put(&thread->ref, lttng_thread_release); + } + diff --git a/package/lttng-tools/patches/patch-src_common_fd-handle_c b/package/lttng-tools/patches/patch-src_common_fd-handle_c new file mode 100644 index 000000000..079fcb539 --- /dev/null +++ b/package/lttng-tools/patches/patch-src_common_fd-handle_c @@ -0,0 +1,20 @@ +--- lttng-tools-2.13.11.orig/src/common/fd-handle.c 2023-08-21 20:32:56.530851999 +0200 ++++ lttng-tools-2.13.11/src/common/fd-handle.c 2024-02-18 06:50:31.478798080 +0100 +@@ -21,7 +21,7 @@ static void fd_handle_release(struct urc + int ret; + struct fd_handle *handle = container_of(ref, struct fd_handle, ref); + +- assert(handle->fd >= 0); ++ //assert(handle->fd >= 0); + ret = close(handle->fd); + if (ret == -1) { + PERROR("Failed to close file descriptor of fd_handle upon release: fd = %d", +@@ -78,7 +78,7 @@ void fd_handle_put(struct fd_handle *han + LTTNG_HIDDEN + int fd_handle_get_fd(struct fd_handle *handle) + { +- assert(handle); ++ //assert(handle); + return handle->fd; + } + diff --git a/package/lttng-tools/patches/patch-src_common_shm_c b/package/lttng-tools/patches/patch-src_common_shm_c new file mode 100644 index 000000000..e55463125 --- /dev/null +++ b/package/lttng-tools/patches/patch-src_common_shm_c @@ -0,0 +1,20 @@ +--- lttng-tools-2.13.11.orig/src/common/shm.c 2023-08-21 20:32:56.550851722 +0200 ++++ lttng-tools-2.13.11/src/common/shm.c 2024-02-18 06:56:33.822793165 +0100 +@@ -32,7 +32,7 @@ static int get_wait_shm(char *shm_path, + int wait_shm_fd, ret; + mode_t mode, old_mode; + +- assert(shm_path); ++ //assert(shm_path); + + /* Default permissions */ + mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP; +@@ -166,7 +166,7 @@ char *shm_ust_get_mmap(char *shm_path, i + char *wait_shm_mmap; + long sys_page_size; + +- assert(shm_path); ++ //assert(shm_path); + + sys_page_size = sysconf(_SC_PAGE_SIZE); + if (sys_page_size < 0) { |