[packages/lttng-tools] - removed obsolete patches, rel 1

baggins baggins at pld-linux.org
Mon Aug 11 09:42:50 CEST 2025


commit 2c45ce57a34b78f43bea7368fda424f871ed1faf
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Aug 11 11:42:31 2025 +0200

    - removed obsolete patches, rel 1

 lttng-tools-assert.patch | 52 ------------------------------------------------
 lttng-tools.spec         |  6 +-----
 x32.patch                | 22 --------------------
 3 files changed, 1 insertion(+), 79 deletions(-)
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index d8690c5..f30024a 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -2,15 +2,13 @@ Summary:	LTTng Trace Control
 Summary(pl.UTF-8):	Sterowanie śledzeniem LTTng
 Name:		lttng-tools
 Version:	2.14.0
-Release:	0.1
+Release:	1
 License:	LGPL v2.1+ (library), GPL v2 (tools)
 Group:		Libraries
 Source0:	https://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
 # Source0-md5:	293be98387e047c5807dcceb1aa9d8fb
 Patch0:		%{name}-python.patch
-Patch1:		x32.patch
 Patch2:		%{name}-swig-crash.patch
-Patch3:		%{name}-assert.patch
 Patch4:		tests.patch
 URL:		https://lttng.org/
 BuildRequires:	asciidoc
@@ -95,9 +93,7 @@ Wiązanie Pythona 3 do LTTng.
 %prep
 %setup -q
 %patch -P 0 -p1
-#patch -P 1 -p1
 %patch -P 2 -p1
-#patch -P 3 -p1
 %patch -P 4 -p1
 
 %build
diff --git a/lttng-tools-assert.patch b/lttng-tools-assert.patch
deleted file mode 100644
index eb64f9f..0000000
--- a/lttng-tools-assert.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix build with -DNDEBUG
---- lttng-tools-2.13.15/src/common/fd-handle.c.orig	2025-04-11 21:14:01.552814819 +0200
-+++ lttng-tools-2.13.15/src/common/fd-handle.c	2025-04-16 18:12:58.062643451 +0200
-@@ -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);
-+	urcu_posix_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);
-+	urcu_posix_assert(handle);
- 	return handle->fd;
- }
- 
---- lttng-tools-2.13.15/src/common/shm.c.orig	2025-04-11 21:14:01.560814846 +0200
-+++ lttng-tools-2.13.15/src/common/shm.c	2025-04-16 18:14:47.862765417 +0200
-@@ -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);
-+	urcu_posix_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);
-+	urcu_posix_assert(shm_path);
- 
- 	sys_page_size = sysconf(_SC_PAGE_SIZE);
- 	if (sys_page_size < 0) {
---- lttng-tools-2.13.15/src/bin/lttng-sessiond/thread.c.orig	2025-04-11 21:14:01.528814737 +0200
-+++ lttng-tools-2.13.15/src/bin/lttng-sessiond/thread.c	2025-04-16 18:18:24.694234677 +0200
-@@ -134,7 +134,7 @@ void lttng_thread_put(struct lttng_threa
- 	if (!thread) {
- 		return;
- 	}
--	assert(thread->ref.refcount);
-+	urcu_posix_assert(thread->ref.refcount);
- 	urcu_ref_put(&thread->ref, lttng_thread_release);
- }
- 
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index 910ffa5..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lttng-tools-2.10.1/src/bin/lttng/utils.c.orig	2017-08-03 21:42:22.082587260 +0200
-+++ lttng-tools-2.10.1/src/bin/lttng/utils.c	2017-12-25 09:44:22.494015902 +0100
-@@ -156,7 +156,7 @@
- static inline
- unsigned int fls_u64(uint64_t x)
- {
--	long r;
-+	int64_t r;
- 
- 	asm("bsrq %1,%0\n\t"
- 	    "jnz 1f\n\t"
---- lttng-tools-2.10.1/src/common/utils.c.orig	2017-08-03 21:42:22.102586698 +0200
-+++ lttng-tools-2.10.1/src/common/utils.c	2017-12-25 09:37:09.418605350 +0100
-@@ -1021,7 +1021,7 @@
- static inline
- unsigned int fls_u64(uint64_t x)
- {
--	long r;
-+	int64_t r;
- 
- 	asm("bsrq %1,%0\n\t"
- 	    "jnz 1f\n\t"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lttng-tools.git/commitdiff/2c45ce57a34b78f43bea7368fda424f871ed1faf



More information about the pld-cvs-commit mailing list