From b641be3cec93a88f909c570b5acdd28b2dfe7e66 Mon Sep 17 00:00:00 2001 From: wagi <> Date: Sep 08 2022 12:37:36 +0000 Subject: Update libtracecmd to version 1.1.3 / rev 1 via SR 1001753 https://build.opensuse.org/request/show/1001753 by user wagi + dimstar_suse 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. --- diff --git a/.files b/.files new file mode 100644 index 0000000..d11063b Binary files /dev/null and b/.files differ diff --git a/.meta b/.meta new file mode 100644 index 0000000..770a135 --- /dev/null +++ b/.meta @@ -0,0 +1,5 @@ + + + + + diff --git a/.rev b/.rev new file mode 100644 index 0000000..a07d953 --- /dev/null +++ b/.rev @@ -0,0 +1,10 @@ + + + f576bd5c8db2bcb0593d50c259566edb + 1.1.3 + + dimstar_suse + 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 + + diff --git a/0001-build-Only-consider-libtracecmd-documentation.patch b/0001-build-Only-consider-libtracecmd-documentation.patch new file mode 100644 index 0000000..b9003f0 --- /dev/null +++ b/0001-build-Only-consider-libtracecmd-documentation.patch @@ -0,0 +1,29 @@ +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 new file mode 100644 index 0000000..9815f5e --- /dev/null +++ b/0002-trace-cmd-library-Fix-decleration-of-msg_lseek.patch @@ -0,0 +1,30 @@ +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 new file mode 100644 index 0000000..5b87e06 --- /dev/null +++ b/libtracecmd.changes @@ -0,0 +1,21 @@ +------------------------------------------------------------------- +Mon Sep 5 10:38:26 UTC 2022 - Daniel Wagner + +- Drop previous added file extension glob on man pages. Whether it's + compressed or not is an implementation detail. + +------------------------------------------------------------------- +Tue Aug 30 12:10:30 UTC 2022 - Daniel Wagner + +- Add file extension on glob in %files section for man pages +- Set Group to Development/Libraries/C and C++ + +------------------------------------------------------------------- +Tue Aug 23 12:29:36 UTC 2022 - Daniel Wagner + +- Initial version libtracecmd 1.1.3 + Split libtracecmd from trace-cmd into a separate package because + libracecmd has a different release cycle and doesn't allign with + trace-cmd. + - Add 0001-build-Only-consider-libtracecmd-documentation.patch + - Add 0002-trace-cmd-library-Fix-decleration-of-msg_lseek.patch diff --git a/libtracecmd.spec b/libtracecmd.spec new file mode 100644 index 0000000..9fa4d06 --- /dev/null +++ b/libtracecmd.spec @@ -0,0 +1,85 @@ +# +# spec file for package libtracecmd +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: libtracecmd +%define lname libtracecmd1 +Version: 1.1.3 +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 +BuildRequires: asciidoc +BuildRequires: libtraceevent-devel +BuildRequires: libtracefs-devel +BuildRequires: source-highlight +BuildRequires: xmlto + +%description +Library for creating and reading trace-cmd data files + +%package -n %lname +Summary: Library for creating and reading trace-cmd data files +Group: System/Libraries + +%description -n %lname +Library for creating and reading trace-cmd data files + +%package devel +Summary: Development files for libtracecmd +Group: Development/Libraries/C and C++ +Requires: %{lname} = %{version} + +%description devel +Development files of the libtracecmd library + +%prep +%autosetup -p1 -n trace-cmd-libtracecmd-%{version} + +%build +make -j1 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 +make -j1 V=1 DESTDIR=%buildroot \ + libdir=%{_libdir} prefix=%{_prefix} \ + pkgconfig_dir=%{_libdir}/pkgconfig \ + htmldir=%{_docdir}/libtracecmd pdfdir=%{_docdir}/libtracecmd \ + install_libs install_doc + +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig + +%files -n %{lname} +%{_libdir}/libtracecmd.so.1* +%license COPYING.LIB + +%files devel +%{_includedir}/trace-cmd +%{_libdir}/libtracecmd.so +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/* +%{_docdir}/libtracecmd +%license COPYING.LIB +%doc README + +%changelog diff --git a/trace-cmd-libtracecmd-1.1.3.tar.gz b/trace-cmd-libtracecmd-1.1.3.tar.gz new file mode 120000 index 0000000..0f241cf --- /dev/null +++ b/trace-cmd-libtracecmd-1.1.3.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeidfotglgnfipne6i7dadnwr2nuwv7tivtunrwpljdduf25pwjr224 \ No newline at end of file