From b8d5fa612c776d42414fe8bb516e71f8946d2167afa2701aa765ab99fb216fb4 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 28 Feb 2020 01:11:18 +0000 Subject: [PATCH 1/3] - Update to version 2.11.0. OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-ust?expand=0&rev=35 --- lttng-ust-2.10.5.tar.bz2 | 3 --- lttng-ust-2.10.5.tar.bz2.asc | 11 ----------- lttng-ust-2.11.0.tar.bz2 | 3 +++ lttng-ust-2.11.0.tar.bz2.asc | 11 +++++++++++ lttng-ust.changes | 7 +++++++ lttng-ust.spec | 9 +++++---- 6 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 lttng-ust-2.10.5.tar.bz2 delete mode 100644 lttng-ust-2.10.5.tar.bz2.asc create mode 100644 lttng-ust-2.11.0.tar.bz2 create mode 100644 lttng-ust-2.11.0.tar.bz2.asc diff --git a/lttng-ust-2.10.5.tar.bz2 b/lttng-ust-2.10.5.tar.bz2 deleted file mode 100644 index 62aa300..0000000 --- a/lttng-ust-2.10.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35 -size 802330 diff --git a/lttng-ust-2.10.5.tar.bz2.asc b/lttng-ust-2.10.5.tar.bz2.asc deleted file mode 100644 index 3c62121..0000000 --- a/lttng-ust-2.10.5.tar.bz2.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAl1zmxAACgkQFygKl4EY -as/a+Af9Hn5VNg6wxLFBQ7WI8D4cD6eEn/g0SYOx8zPsMY/p2RSnl2nU+Kl6OJFj -QvKx4lC4fRkq4TfSEpBGGWmAG8wjqYLmiSvcRK1JHUhZk9tiaHZXfZ2/afLfUnII -sM/wvKp30Mv90CtSF6qAQ6mv3qHS5gJPnbwj8MPIi9eQFze+GX201YYcdT+qKLqA -RVpS723fN/JE18aHETxON8l7JXAjABT8s2OhYn/Xamr+skTJC2CkKzU07pbLARHS -LyaZmD3GJmlk5s+4eNBMQodZcS/Ll9wZHhZRkf35lhJijAyQGPHBK5phUsU2gLFG -0ZeWApwGxzMuI8Qnar/oXBKv3h/QhQ== -=1+/O ------END PGP SIGNATURE----- diff --git a/lttng-ust-2.11.0.tar.bz2 b/lttng-ust-2.11.0.tar.bz2 new file mode 100644 index 0000000..de4ef19 --- /dev/null +++ b/lttng-ust-2.11.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8 +size 824285 diff --git a/lttng-ust-2.11.0.tar.bz2.asc b/lttng-ust-2.11.0.tar.bz2.asc new file mode 100644 index 0000000..9875d2a --- /dev/null +++ b/lttng-ust-2.11.0.tar.bz2.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAl2owsMACgkQFygKl4EY +as87ZQf/cH7QiCWOyy8RixuNjBGQ2zesNxpiwOf9gtigwUcGL0yZJuaAbrvXCE1Q +Y2tEzsDo3SGsxIWVb8W/6DePFZvGoxMgHb65sl8a+FdALvGy5tjcaZrj89tSMkG/ +RQ9iiGrB8SMNJ6XS+fd9T+6gU0w38F6pAI6UDzm6Zle3RumqlVPImjqh6XSLrcYR +shaTKfUO+G9Ulik50vUMkRNDAq7LzObCBgo9JZk10F+0rHUkBD/naS4fm8DKlz2u +ZrkdA04rM2HBG0cVu+IoZtwiwlE2ynT/wyplQTiR/UZPgUroUEJx2c0mDUhJow1z +DENttqGP8VkkGlOOrsS/dBAwaWuLjA== +=Ml0i +-----END PGP SIGNATURE----- diff --git a/lttng-ust.changes b/lttng-ust.changes index 49c39b1..d68fda3 100644 --- a/lttng-ust.changes +++ b/lttng-ust.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 26 14:29:32 UTC 2020 - Alexei Sorokin + +- Update to version 2.11.0: + * See /usr/share/doc/packages/lttng-ust/ChangeLog +- Drop support for old openSUSE versions. + ------------------------------------------------------------------- Tue Sep 24 08:06:00 UTC 2019 - Martin Liška diff --git a/lttng-ust.spec b/lttng-ust.spec index 0f4f5f3..3872914 100644 --- a/lttng-ust.spec +++ b/lttng-ust.spec @@ -1,7 +1,7 @@ # # spec file for package lttng-ust # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define sover 0 %define sover_ctl 4 Name: lttng-ust -Version: 2.10.5 +Version: 2.11.0 Release: 0 Summary: Linux Trace Toolkit Userspace Tracer library License: GPL-2.0-only @@ -32,8 +32,9 @@ BuildRequires: gcc-c++ BuildRequires: liburcu-devel BuildRequires: pkgconfig BuildRequires: python3 +BuildRequires: pkgconfig(numa) BuildRequires: pkgconfig(uuid) -ExclusiveArch: %{ix86} x86_64 aarch64 ppc64 ppc64le +ExclusiveArch: %ix86 x86_64 aarch64 ppc64 ppc64le %description This library may be used by user space applications to generate @@ -116,7 +117,7 @@ export PYTHON=python3 --disable-static \ --disable-maintainer-mode \ --enable-python-agent -make %{?_smp_mflags} V=1 +%make_build %install %make_install From dbe7f61ef6abee4afb6ee3836720d762339dec0a4c8993166d096c8cc5958f5d Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 28 Feb 2020 01:57:50 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-ust?expand=0&rev=36 --- lttng-ust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lttng-ust.spec b/lttng-ust.spec index 3872914..85bfe53 100644 --- a/lttng-ust.spec +++ b/lttng-ust.spec @@ -29,10 +29,10 @@ Source: https://lttng.org/files/lttng-ust/lttng-ust-%{version}.tar.bz2 Source1: https://lttng.org/files/lttng-ust/lttng-ust-%{version}.tar.bz2.asc Source2: %{name}.keyring BuildRequires: gcc-c++ +BuildRequires: libnuma-devel BuildRequires: liburcu-devel BuildRequires: pkgconfig BuildRequires: python3 -BuildRequires: pkgconfig(numa) BuildRequires: pkgconfig(uuid) ExclusiveArch: %ix86 x86_64 aarch64 ppc64 ppc64le From 2a2dfc24404af4a0453c293c6c830efdb8b56eedb500ae5d8d3144ece6229fd6 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 28 Feb 2020 09:58:13 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-ust?expand=0&rev=37 --- lttng-ust-2.11.0-fix-no-common.patch | 22 ++++++++++++++++++++++ lttng-ust.changes | 2 ++ lttng-ust.spec | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 lttng-ust-2.11.0-fix-no-common.patch diff --git a/lttng-ust-2.11.0-fix-no-common.patch b/lttng-ust-2.11.0-fix-no-common.patch new file mode 100644 index 0000000..f288b4c --- /dev/null +++ b/lttng-ust-2.11.0-fix-no-common.patch @@ -0,0 +1,22 @@ +--- a/liblttng-ust-ctl/ustctl.c ++++ b/liblttng-ust-ctl/ustctl.c +@@ -77,8 +77,6 @@ extern void lttng_ring_buffer_client_discard_exit(void); + extern void lttng_ring_buffer_client_discard_rt_exit(void); + extern void lttng_ring_buffer_metadata_client_exit(void); + +-volatile enum ust_loglevel ust_loglevel; +- + int ustctl_release_handle(int sock, int handle) + { + struct ustcomm_ust_msg lum; +--- a/liblttng-ust-fd/lttng-ust-fd.c ++++ b/liblttng-ust-fd/lttng-ust-fd.c +@@ -28,8 +28,6 @@ + #include + #include "usterr-signal-safe.h" + +-volatile enum ust_loglevel ust_loglevel; +- + static int (*__lttng_ust_fd_plibc_close)(int fd); + static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream); + diff --git a/lttng-ust.changes b/lttng-ust.changes index d68fda3..d6ba549 100644 --- a/lttng-ust.changes +++ b/lttng-ust.changes @@ -3,6 +3,8 @@ Wed Feb 26 14:29:32 UTC 2020 - Alexei Sorokin - Update to version 2.11.0: * See /usr/share/doc/packages/lttng-ust/ChangeLog +- Add lttng-ust-2.11.0-fix-no-common.patch: Fix build with + -fno-common (commit 21a934df, boo#1160400). - Drop support for old openSUSE versions. ------------------------------------------------------------------- diff --git a/lttng-ust.spec b/lttng-ust.spec index 85bfe53..fee041f 100644 --- a/lttng-ust.spec +++ b/lttng-ust.spec @@ -28,6 +28,8 @@ URL: https://lttng.org/ Source: https://lttng.org/files/lttng-ust/lttng-ust-%{version}.tar.bz2 Source1: https://lttng.org/files/lttng-ust/lttng-ust-%{version}.tar.bz2.asc Source2: %{name}.keyring +# PATCH-FIX-UPSTREAM lttng-ust-2.11.0-fix-no-common.patch boo#1160400 mjeanson@gmail.com -- Fix build with -fno-common (commit 21a934df). +Patch0: %{name}-2.11.0-fix-no-common.patch BuildRequires: gcc-c++ BuildRequires: libnuma-devel BuildRequires: liburcu-devel @@ -104,7 +106,7 @@ This package includes documentation and examples for developing applications using LTTng userspace tracing. %prep -%setup -q +%autosetup -p1 # Fix Python shebang. sed -i -e "1s|^#!.*$|#!%{_bindir}/python3|" tools/lttng-gen-tp