From 504f186003af1134d225c85baf19b511e6077510 Mon Sep 17 00:00:00 2001
From: jengelh <>
Date: Dec 04 2022 14:15:25 +0000
Subject: Update libtracecmd to version 1.2.0 / rev 2 via SR 1039895
https://build.opensuse.org/request/show/1039895
by user jengelh + dimstar_suse
- Update to release 1.2.0
---
diff --git a/.files b/.files
index d11063b..1eedf7c 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index a07d953..b92b4ca 100644
--- a/.rev
+++ b/.rev
@@ -7,4 +7,12 @@
The trace-cmd project factored common code into a new library called libtracecmd. The update of trace-cmd 1.3 is depending on this new library.
1001753
+
+ 27e00f78e1b685f2f5bd109f3fdbe3b1
+ 1.2.0
+
+ dimstar_suse
+ - Update to release 1.2.0
+ 1039895
+
diff --git a/0001-build-Only-consider-libtracecmd-documentation.patch b/0001-build-Only-consider-libtracecmd-documentation.patch
deleted file mode 100644
index b9003f0..0000000
--- a/0001-build-Only-consider-libtracecmd-documentation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 19d0ebe2d002410e72672ad830eca9d8a5ec23d9 Mon Sep 17 00:00:00 2001
-From: Daniel Wagner
-Date: Tue, 23 Aug 2022 15:30:42 +0200
-Subject: [PATCH] build: Only consider libtracecmd documentation
-
-We are not interested to build the trace-cmd
-documentation. Unfortuantly, we can't control this from the top level
-Makefile, hence just disable it on source code level.
-
-Signed-off-by: Daniel Wagner
----
- Documentation/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Documentation/Makefile b/Documentation/Makefile
-index ec364916d13f..89795defdba3 100644
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -4,7 +4,6 @@ doc_dir:=$(src)/Documentation
-
- export doc_dir
-
--SUBDIR += trace-cmd
- SUBDIR += libtracecmd
-
- .PHONY: $(SUBDIR)
---
-2.37.1
-
diff --git a/0002-trace-cmd-library-Fix-decleration-of-msg_lseek.patch b/0002-trace-cmd-library-Fix-decleration-of-msg_lseek.patch
deleted file mode 100644
index 9815f5e..0000000
--- a/0002-trace-cmd-library-Fix-decleration-of-msg_lseek.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b2bf3d3f33d343b88008d18d38dbbb40edf4db1f Mon Sep 17 00:00:00 2001
-From: Daniel Wagner
-Date: Wed, 24 Aug 2022 14:34:29 +0200
-Subject: [PATCH] trace-cmd library: Fix decleration of msg_lseek
-
-The definition wants an off64_t argument, thus fix up the
-deceleration. On 64bit archs there is no difference but not so on
-32 bit archs.
-
-Signed-off-by: Daniel Wagner
----
- lib/trace-cmd/include/trace-cmd-local.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/trace-cmd/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h
-index f9892fa77a8c..6ac341374941 100644
---- a/lib/trace-cmd/include/trace-cmd-local.h
-+++ b/lib/trace-cmd/include/trace-cmd-local.h
-@@ -91,7 +91,7 @@ struct cpu_data_source {
- int out_write_cpu_data(struct tracecmd_output *handle, int cpus,
- struct cpu_data_source *data, const char *buff_name);
- int out_write_emty_cpu_data(struct tracecmd_output *handle, int cpus);
--off64_t msg_lseek(struct tracecmd_msg_handle *msg_handle, off_t offset, int whence);
-+off64_t msg_lseek(struct tracecmd_msg_handle *msg_handle, off64_t offset, int whence);
- unsigned long long get_last_option_offset(struct tracecmd_input *handle);
- unsigned int get_meta_strings_size(struct tracecmd_input *handle);
-
---
-2.37.1
-
diff --git a/libtracecmd.changes b/libtracecmd.changes
index 5b87e06..f6080a9 100644
--- a/libtracecmd.changes
+++ b/libtracecmd.changes
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Sat Dec 3 13:04:42 UTC 2022 - Jan Engelhardt
+
+- Update to release 1.2.0
+ * Process trace_clock for v7 trace.dat files
+ * Add network roles for time sync
+ * Have clock source TAI parse to seconds
+ * Use uncompressed size for file size
+ * Allow callers to save private data in tracecmd_input handlers
+ * Add filtering logic for iterating events
+ * Add man pages for iterator functions
+ * Add API for mapping between host and guests
+- Delete 0001-build-Only-consider-libtracecmd-documentation.patch,
+ 0002-trace-cmd-library-Fix-decleration-of-msg_lseek.patch (merged)
+- Add static-assign.patch
+
+-------------------------------------------------------------------
Mon Sep 5 10:38:26 UTC 2022 - Daniel Wagner
- Drop previous added file extension glob on man pages. Whether it's
diff --git a/libtracecmd.spec b/libtracecmd.spec
index 9fa4d06..b628a7e 100644
--- a/libtracecmd.spec
+++ b/libtracecmd.spec
@@ -18,19 +18,19 @@
Name: libtracecmd
%define lname libtracecmd1
-Version: 1.1.3
+Version: 1.2.0
Release: 0
Summary: Library for creating and reading trace-cmd data files
License: LGPL-2.1-only
Group: Development/Libraries/C and C++
URL: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
-Source0: trace-cmd-libtracecmd-%{version}.tar.gz
-Patch1: 0001-build-Only-consider-libtracecmd-documentation.patch
-Patch2: 0002-trace-cmd-library-Fix-decleration-of-msg_lseek.patch
-BuildRequires: libzstd-devel
+Source: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-libtracecmd-%version.tar.gz
+Patch1: static-assign.patch
BuildRequires: asciidoc
+BuildRequires: fdupes
BuildRequires: libtraceevent-devel
BuildRequires: libtracefs-devel
+BuildRequires: libzstd-devel
BuildRequires: source-highlight
BuildRequires: xmlto
@@ -56,7 +56,7 @@ Development files of the libtracecmd library
%autosetup -p1 -n trace-cmd-libtracecmd-%{version}
%build
-make -j1 V=1 prefix=%{_prefix} libdir=%{_libdir} libs
+%make_build V=1 prefix=%{_prefix} libdir=%{_libdir} libs
make -j1 V=1 MANPAGE_DOCBOOK_XSL=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl doc
%install
@@ -65,6 +65,11 @@ make -j1 V=1 DESTDIR=%buildroot \
pkgconfig_dir=%{_libdir}/pkgconfig \
htmldir=%{_docdir}/libtracecmd pdfdir=%{_docdir}/libtracecmd \
install_libs install_doc
+# remove files already built&shipped in trace-cmd
+for i in man1 man5 man8; do
+ rm -Rf "%buildroot/%_mandir/$i"
+done
+%fdupes %buildroot/%_prefix
%post -n %{lname} -p /sbin/ldconfig
%postun -n %{lname} -p /sbin/ldconfig
@@ -77,7 +82,7 @@ make -j1 V=1 DESTDIR=%buildroot \
%{_includedir}/trace-cmd
%{_libdir}/libtracecmd.so
%{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/*
+%{_mandir}/man*/*
%{_docdir}/libtracecmd
%license COPYING.LIB
%doc README
diff --git a/static-assign.patch b/static-assign.patch
new file mode 100644
index 0000000..26c539e
--- /dev/null
+++ b/static-assign.patch
@@ -0,0 +1,87 @@
+From: Jan Engelhardt
+Date: 2022-12-03 14:04:21.501944293 +0100
+References: https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/FPNDORIL6NDJD3HFQ76LQBIRBCWVG6TV/
+Upstream: no
+
+Mark a few vars as := in the hope to the cut the number of recursive
+pkg-config calls at least by some amount. It's not a panacea,
+you really must split the "configure" and the "build" steps
+and not conflate them together. Use autotools/cmake/meson/whatever.
+Not this.
+
+---
+ Makefile | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+Index: trace-cmd-libtracecmd-1.2.0/Makefile
+===================================================================
+--- trace-cmd-libtracecmd-1.2.0.orig/Makefile
++++ trace-cmd-libtracecmd-1.2.0/Makefile
+@@ -221,8 +221,8 @@ LIBS ?= -ldl
+ LIBTRACECMD_DIR = $(obj)/lib/trace-cmd
+ LIBTRACECMD_STATIC = $(LIBTRACECMD_DIR)/libtracecmd.a
+ LIBTRACECMD_SHARED = $(LIBTRACECMD_DIR)/libtracecmd.so.$(LIBTRACECMD_VERSION)
+-LIBTRACECMD_SHARED_VERSION = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
+-LIBTRACECMD_SHARED_SO = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
++LIBTRACECMD_SHARED_VERSION := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
++LIBTRACECMD_SHARED_SO := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
+
+ export LIBTRACECMD_STATIC LIBTRACECMD_SHARED
+ export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO
+@@ -230,12 +230,12 @@ export LIBTRACECMD_SHARED_VERSION LIBTRA
+ LIBTRACEEVENT=libtraceevent
+ LIBTRACEFS=libtracefs
+
+-TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y")
+-TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y")
++TEST_LIBTRACEEVENT := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y")
++TEST_LIBTRACEFS := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y")
+
+ ifeq ("$(TEST_LIBTRACEEVENT)", "y")
+-LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
+-LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
++LIBTRACEEVENT_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
++LIBTRACEEVENT_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
+ else
+ .PHONY: warning
+ warning:
+@@ -253,8 +253,8 @@ endif
+ export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS
+
+ ifeq ("$(TEST_LIBTRACEFS)", "y")
+-LIBTRACEFS_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
+-LIBTRACEFS_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
++LIBTRACEFS_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
++LIBTRACEFS_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
+ else
+ .PHONY: warning
+ warning:
+@@ -324,11 +324,11 @@ endif
+ export ZLIB_LDLAGS
+
+ ifndef NO_LIBZSTD
+-TEST_LIBZSTD = $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y")
++TEST_LIBZSTD := $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y")
+
+ ifeq ("$(TEST_LIBZSTD)", "y")
+-LIBZSTD_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags libzstd")
+-LIBZSTD_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs libzstd")
++LIBZSTD_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags libzstd")
++LIBZSTD_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs libzstd")
+ CFLAGS += -DHAVE_ZSTD
+ ZSTD_INSTALLED=1
+ $(info Have ZSTD compression support)
+@@ -571,10 +571,10 @@ report_nopythondev: force
+ $(Q)echo
+
+ ifndef NO_PYTHON
+-PYTHON_INCLUDES = `$(PKG_CONFIG) --cflags $(PYTHON_PKGCONFIG_VERS)`
+-PYTHON_LDFLAGS = `$(PKG_CONFIG) --libs $(PYTHON_PKGCONFIG_VERS)` \
++PYTHON_INCLUDES := `$(PKG_CONFIG) --cflags $(PYTHON_PKGCONFIG_VERS)`
++PYTHON_LDFLAGS := `$(PKG_CONFIG) --libs $(PYTHON_PKGCONFIG_VERS)` \
+ $(shell $(PYTHON_VERS)-config --ldflags)
+-PYGTK_CFLAGS = `$(PKG_CONFIG) --cflags pygtk-2.0`
++PYGTK_CFLAGS := `$(PKG_CONFIG) --cflags pygtk-2.0`
+ else
+ PYTHON_INCLUDES =
+ PYTHON_LDFLAGS =
diff --git a/trace-cmd-libtracecmd-1.1.3.tar.gz b/trace-cmd-libtracecmd-1.1.3.tar.gz
deleted file mode 120000
index 0f241cf..0000000
--- a/trace-cmd-libtracecmd-1.1.3.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeidfotglgnfipne6i7dadnwr2nuwv7tivtunrwpljdduf25pwjr224
\ No newline at end of file
diff --git a/trace-cmd-libtracecmd-1.2.0.tar.gz b/trace-cmd-libtracecmd-1.2.0.tar.gz
new file mode 120000
index 0000000..1706067
--- /dev/null
+++ b/trace-cmd-libtracecmd-1.2.0.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeibte5bcoe5352ikigay3zxru6k7riixbjeoplylefkqlz67uhwsfe
\ No newline at end of file