cottsay pushed to lttng-tools (epel9). "New upstream release 2.12.0"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From 7275b4b5cdc64e856b475e5ae056129bc7e7260f Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: Apr 15 2020 03:14:02 +0000
Subject: New upstream release 2.12.0
---
diff --git a/.gitignore b/.gitignore
index 9517d05..a8cc5fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/lttng-tools-2.10.7.tar.bz2
/lttng-tools-2.11.0.tar.bz2
/lttng-tools-2.11.1.tar.bz2
+/lttng-tools-2.12.0.tar.bz2
diff --git a/0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch b/0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
deleted file mode 100644
index 98cc2c3..0000000
--- a/0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3029bc92f20d249ebea8779e46f6007aa0519b9a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
- <jeremie.galarneau(a)efficios.com>
-Date: Thu, 19 Dec 2019 22:13:10 -0500
-Subject: [PATCH lttng-tools] Fix: sessiond: check for lttng-modules ABI 2.1
- rather than 2.8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The clear patchset introduces a regression that breaks session
-rotations when the kernel domain is used. The 2.8 lttng-modules ABI
-does not exist yet.
-
-The packet sequence number functionality was introduced in LTTng 2.8,
-which introduced the 2.1 kernel tracer ABI.
-
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau(a)efficios.com>
-Change-Id: Ief97e7e25f6f0fcb5b5b97b39abb417c1eb327ec
----
- src/bin/lttng-sessiond/kernel.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/src/bin/lttng-sessiond/kernel.c
-+++ b/src/bin/lttng-sessiond/kernel.c
-@@ -1443,9 +1443,10 @@
- }
-
- /*
-- * Packet sequence number was introduced in 2.8
-+ * Packet sequence number was introduced in LTTng 2.8,
-+ * lttng-modules ABI 2.1.
- */
-- if (abi.major >= 2 && abi.minor >= 8) {
-+ if (abi.major >= 2 && abi.minor >= 1) {
- /* Supported */
- ret = 1;
- } else {
diff --git a/gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg b/gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
new file mode 100644
index 0000000..d020f1d
Binary files /dev/null and b/gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg differ
diff --git a/lttng-tools-2.12.0.tar.bz2.asc b/lttng-tools-2.12.0.tar.bz2.asc
new file mode 100644
index 0000000..bfdf799
--- /dev/null
+++ b/lttng-tools-2.12.0.tar.bz2.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEf0kxSibg3nhCdoDgXxsqB4nxKxEFAl6M9GUACgkQXxsqB4nx
+KxFzFQ/+LhaHcMs8x+Ic/BfE3NEZv6Jvw6CPO9Dc2JT+qi8flrm4d4g3bgb3+lBg
+Zg/weOMWb6PfJ9EdVN/v/ibVRyw7aOH1ODP1u3SDYRFQP4Tcb2KlXdjMuFmTCQWF
+5ypJJ9u26MsFxYu2rDKQMrVMj/8+ZcirHV9wR6EkXjHPOwiC2OvR0sdRB8rEZF08
+MBQ5ffG7LY+FrMYYJSqFLnATZ55ifzV7GzQO0MQrKCsC1BZtY1UGrSR+MAWJcuZx
+Cs2PoMXkt0u9DPT+tsNXnP1K8Wtz9ms+lE5bsL6ddFNHQqdcMZyC52jbGU9SESNz
+pWhRhtZziVqgHFXkdcPjgVUeVsPjr5lAUYT92rCQ8DUmVA7bHDFAqguYmuceg+m4
+bDPK02bVEfsBYZ5ENe4uEVyqU4DS5uKGiH/w2h3wrYEDFTvriHEgtEtHhHk9QmGG
+oUvjlMB3syzTTGxDZwOn1xcMThU9q16Wipbt2b5OmjwZhC4Z88CwpwwDypNDV2c+
+vS7HvLp9ANF7M5ciisF/KLeXbuIN9aEx0sSFGw0PCKhofhhNjzfkanF4PcwSek3k
+fGo4dxaPIKT7HZrR6B6DaUwzZjIRjaD9x9DnDvegdQSSZE8hctXxkzqrauIq9964
+b+wmx2NEH0C4MeNUWEL0C2Vi6944lSd+Zcep5bCw3a5sub1vRqA=
+=3JEo
+-----END PGP SIGNATURE-----
diff --git a/lttng-tools.spec b/lttng-tools.spec
index b598e51..536655c 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -8,22 +8,23 @@
Name: lttng-tools
-Version: 2.11.1
-Release: 2%{?dist}
+Version: 2.12.0
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
URL: http://lttng.org
Summary: LTTng control and utility programs
Source0: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
-Source1: lttng-sessiond.service
-Patch0: 0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
+Source1: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2.asc
+# gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
+Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
+Source3: lttng-sessiond.service
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 2.7.6
-BuildRequires: lttng-ust-devel >= 2.11.0
-BuildRequires: lttng-ust-devel < 2.12.0
+BuildRequires: lttng-ust-devel >= 2.12.0
+BuildRequires: lttng-ust-devel < 2.13.0
BuildRequires: popt-devel
BuildRequires: systemd-units
BuildRequires: systemtap-sdt-devel
@@ -115,6 +116,7 @@ exit 0
%{_libdir}/*.so.*
%{_mandir}/man1/lttng.1.gz
%{_mandir}/man1/lttng-add-context.1.gz
+%{_mandir}/man1/lttng-clear.1.gz
%{_mandir}/man1/lttng-crash.1.gz
%{_mandir}/man1/lttng-create.1.gz
%{_mandir}/man1/lttng-destroy.1.gz
@@ -171,6 +173,9 @@ exit 0
%endif
%changelog
+* Tue Apr 14 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.12.0-1
+- New upstream release
+
* Wed Feb 12 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.11.1-2
- Fix session rotation with kernel domain
diff --git a/sources b/sources
index cb0f79a..887007c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lttng-tools-2.11.1.tar.bz2) = 138f1da618d4cb8a2977066a2c490ed772ecce1c71ba164cad4780be57ab961db74495b04cbf76e1bf6b4933702fefb9aecd761e5e8c6c23ba730656af8b6794
+SHA512 (lttng-tools-2.12.0.tar.bz2) = 87613de34141c75b7ff0eb7b4292d26eea5381a7f298130cf5e802255aa7b0e55f43268dffed71b51d1e5dcd96b92cd517e13557fe64ee121bf1b419b2935a24
https://src.fedoraproject.org/rpms/lttng-tools/c/7275b4b5cdc64e856b475e5a...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "New upstream release 2.12.1"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From 77552d03bb247cb0831c2f3ba017441b1f7fad07 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: May 26 2020 16:04:59 +0000
Subject: New upstream release 2.12.1
---
diff --git a/.gitignore b/.gitignore
index a8cc5fd..705e10b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/lttng-tools-2.11.0.tar.bz2
/lttng-tools-2.11.1.tar.bz2
/lttng-tools-2.12.0.tar.bz2
+/lttng-tools-2.12.1.tar.bz2
diff --git a/lttng-tools-2.12.0.tar.bz2.asc b/lttng-tools-2.12.0.tar.bz2.asc
deleted file mode 100644
index bfdf799..0000000
--- a/lttng-tools-2.12.0.tar.bz2.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEf0kxSibg3nhCdoDgXxsqB4nxKxEFAl6M9GUACgkQXxsqB4nx
-KxFzFQ/+LhaHcMs8x+Ic/BfE3NEZv6Jvw6CPO9Dc2JT+qi8flrm4d4g3bgb3+lBg
-Zg/weOMWb6PfJ9EdVN/v/ibVRyw7aOH1ODP1u3SDYRFQP4Tcb2KlXdjMuFmTCQWF
-5ypJJ9u26MsFxYu2rDKQMrVMj/8+ZcirHV9wR6EkXjHPOwiC2OvR0sdRB8rEZF08
-MBQ5ffG7LY+FrMYYJSqFLnATZ55ifzV7GzQO0MQrKCsC1BZtY1UGrSR+MAWJcuZx
-Cs2PoMXkt0u9DPT+tsNXnP1K8Wtz9ms+lE5bsL6ddFNHQqdcMZyC52jbGU9SESNz
-pWhRhtZziVqgHFXkdcPjgVUeVsPjr5lAUYT92rCQ8DUmVA7bHDFAqguYmuceg+m4
-bDPK02bVEfsBYZ5ENe4uEVyqU4DS5uKGiH/w2h3wrYEDFTvriHEgtEtHhHk9QmGG
-oUvjlMB3syzTTGxDZwOn1xcMThU9q16Wipbt2b5OmjwZhC4Z88CwpwwDypNDV2c+
-vS7HvLp9ANF7M5ciisF/KLeXbuIN9aEx0sSFGw0PCKhofhhNjzfkanF4PcwSek3k
-fGo4dxaPIKT7HZrR6B6DaUwzZjIRjaD9x9DnDvegdQSSZE8hctXxkzqrauIq9964
-b+wmx2NEH0C4MeNUWEL0C2Vi6944lSd+Zcep5bCw3a5sub1vRqA=
-=3JEo
------END PGP SIGNATURE-----
diff --git a/lttng-tools-2.12.1.tar.bz2.asc b/lttng-tools-2.12.1.tar.bz2.asc
new file mode 100644
index 0000000..7dc1025
--- /dev/null
+++ b/lttng-tools-2.12.1.tar.bz2.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEf0kxSibg3nhCdoDgXxsqB4nxKxEFAl662yYACgkQXxsqB4nx
+KxG/YBAAi+YYl8tCwdezh8FQZUra3entvakTL8dL1sykQeVopyNEYIWRYSXzbmjy
+fxq+wPF6CKyMigbLUMSBbkglJcWMYhwPjvXbNK6RAwtcz6qUO5UXd5D4MdkdM/PM
+HDi79cPgk78dIx0x6KGAKqxOsRgO6OAZ4bVcEUnVotpVZK8HTc4uJPyYPGWzhC3+
+CYBEviFvSQERkOoWfSr7nJaZ5GSHso/2kaRE2LIR4UB7l3eibHzPLoVYlbsjyzhz
+Ow7AUKhJKqz/RGFc4zQlyo3ed1i9I8LLX8T44jqlphNnE2TJxSoePgwLLhG/vqQx
+ns9Dx43SJn3J4W9oOON1JzunXgXFSjjnJINbM8KRdQ6Ii4KHbhz1n+A9xTIzZTiA
+xv0/MA0qvtIBpoQ9zYv6To4Qo6pSxfksTob1mkv/32e0qV2xyDQNa0R2bEo3FHPp
+d1slnHpn3TrpBoUKQPoUQzSqSrIri+nKQGUDUvosSNpAuqh4MFgypXtcLe/NrLew
+ADX2TiQ+dD7wasaTSe58QG9cC/aokI3UENsVMmtx/sKxN2sV4tY466Od3jd/M5P3
+qkSyxPJ9P7H4vk9ZqeuU6okAj+D/NN4kW9TWNJV5qvfFa0DVhsS3QBFyg8sR6P4k
+Syxl0kNvzIK4MEfm+gHCbZNILdNjKqdMLdSgVtuXXZYEw2DVPcw=
+=7+Iz
+-----END PGP SIGNATURE-----
diff --git a/lttng-tools.spec b/lttng-tools.spec
index a21eb50..28ab52d 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -8,8 +8,8 @@
Name: lttng-tools
-Version: 2.12.0
-Release: 2%{?dist}
+Version: 2.12.1
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
URL: http://lttng.org
Summary: LTTng control and utility programs
@@ -173,6 +173,9 @@ exit 0
%endif
%changelog
+* Tue May 26 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.12.1-1
+- New upstream release
+
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.12.0-2
- Rebuilt for Python 3.9
diff --git a/sources b/sources
index 887007c..cb243bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lttng-tools-2.12.0.tar.bz2) = 87613de34141c75b7ff0eb7b4292d26eea5381a7f298130cf5e802255aa7b0e55f43268dffed71b51d1e5dcd96b92cd517e13557fe64ee121bf1b419b2935a24
+SHA512 (lttng-tools-2.12.1.tar.bz2) = 1bbffdc790275554f77f0b39392aff786f3644cd3fbd357dcbdac2242ea0a40fbd9c174746a57e4362c67956460a42ea9ff485860fe9654a3e55f381b276a8de
https://src.fedoraproject.org/rpms/lttng-tools/c/77552d03bb247cb0831c2f3b...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "Rebuilt for Python 3.9"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:50 UTC
From 7dbf7f2a147b5c9abb4d206d286e0359a01c4b1d Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro(a)hroncok.cz>
Date: May 27 2020 10:32:35 +0000
Subject: Rebuilt for Python 3.9
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 28ab52d..0cb564a 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -9,7 +9,7 @@
Name: lttng-tools
Version: 2.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2
URL: http://lttng.org
Summary: LTTng control and utility programs
@@ -173,6 +173,9 @@ exit 0
%endif
%changelog
+* Wed May 27 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.12.1-2
+- Rebuilt for Python 3.9
+
* Tue May 26 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.12.1-1
- New upstream release
https://src.fedoraproject.org/rpms/lttng-tools/c/7dbf7f2a147b5c9abb4d206d...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "New upstream release 2.11.1"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From 564506f5eb91bab2fc35187a1d5b235b79d92317 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: Feb 10 2020 16:28:43 +0000
Subject: New upstream release 2.11.1
---
diff --git a/.gitignore b/.gitignore
index a1fb9cc..9517d05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/lttng-tools-2.10.5.tar.bz2
/lttng-tools-2.10.7.tar.bz2
/lttng-tools-2.11.0.tar.bz2
+/lttng-tools-2.11.1.tar.bz2
diff --git a/0001-Fix-build-failure-with-fno-common.patch b/0001-Fix-build-failure-with-fno-common.patch
deleted file mode 100644
index b7d0479..0000000
--- a/0001-Fix-build-failure-with-fno-common.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From 83f594b319460f9f3f1bb1289c115a7247946863 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson(a)efficios.com>
-Date: Thu, 16 Jan 2020 14:34:47 -0500
-Subject: [PATCH lttng-tools] Fix: build failure with -fno-common
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 will default to building with -fno-common, this inhibits the
-linker from merging multiple tentative definitions of a symbol in an
-archive.
-
-I'm not sure I understand what happen with the symbols in mi-lttng.h
-but a similar issue was adressed in:
-
- commit 4965f956f3ef47388fb4a1b2f8f504abfe31afe7
- Author: Jérémie Galarneau <jeremie.galarneau(a)efficios.com>
- Date: Fri May 22 12:53:30 2015 -0400
-
- Fix: Mark MI and Config string declarations as extern
-
- This fixes a build issue with GCC 5.1 which would complain about
- these symbols being defined multiple times.
-
-Make sure these symbols are extern and defined only in one compile unit.
-
-For more information, see:
-https://gcc.gnu.org/gcc-10/porting_to.html
-
-Change-Id: I139c9695371836cb1011f9ce192080b602ed2fbc
-Signed-off-by: Michael Jeanson <mjeanson(a)efficios.com>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau(a)efficios.com>
----
- src/bin/lttng-consumerd/lttng-consumerd.h | 2 +-
- src/bin/lttng-sessiond/ust-app.c | 4 ++
- src/bin/lttng-sessiond/ust-app.h | 6 +--
- src/common/mi-lttng.h | 58 +++++++++++------------
- tests/regression/tools/live/live_test.c | 3 --
- tests/unit/test_kernel_data.c | 4 --
- tests/unit/test_session.c | 4 --
- tests/unit/test_ust_data.c | 7 ---
- 8 files changed, 37 insertions(+), 51 deletions(-)
-
-diff --git a/src/bin/lttng-consumerd/lttng-consumerd.h b/src/bin/lttng-consumerd/lttng-consumerd.h
-index 6d18fdf88..dbbb83e87 100644
---- a/src/bin/lttng-consumerd/lttng-consumerd.h
-+++ b/src/bin/lttng-consumerd/lttng-consumerd.h
-@@ -23,7 +23,7 @@
- #define NR_LTTNG_CONSUMER_READY 1
- extern int lttng_consumer_ready;
-
--const char *tracing_group_name;
-+extern const char *tracing_group_name;
-
- enum lttng_consumer_type lttng_consumer_get_type(void);
-
-diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
-index 205fdad16..f7acbf190 100644
---- a/src/bin/lttng-sessiond/ust-app.c
-+++ b/src/bin/lttng-sessiond/ust-app.c
-@@ -45,6 +45,10 @@
- #include "notification-thread-commands.h"
- #include "rotate.h"
-
-+struct lttng_ht *ust_app_ht;
-+struct lttng_ht *ust_app_ht_by_sock;
-+struct lttng_ht *ust_app_ht_by_notify_sock;
-+
- static
- int ust_app_flush_app_session(struct ust_app *app, struct ust_app_session *ua_sess);
-
-diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
-index 4c8c3cc62..169fc0814 100644
---- a/src/bin/lttng-sessiond/ust-app.h
-+++ b/src/bin/lttng-sessiond/ust-app.h
-@@ -81,7 +81,7 @@ struct ust_register_msg {
- * Global applications HT used by the session daemon. This table is indexed by
- * PID using the pid_n node and pid value of an ust_app.
- */
--struct lttng_ht *ust_app_ht;
-+extern struct lttng_ht *ust_app_ht;
-
- /*
- * Global applications HT used by the session daemon. This table is indexed by
-@@ -89,13 +89,13 @@ struct lttng_ht *ust_app_ht;
- *
- * The 'sock' in question here is the 'command' socket.
- */
--struct lttng_ht *ust_app_ht_by_sock;
-+extern struct lttng_ht *ust_app_ht_by_sock;
-
- /*
- * Global applications HT used by the session daemon. This table is indexed by
- * socket using the notify_sock_n node and notify_sock value of an ust_app.
- */
--struct lttng_ht *ust_app_ht_by_notify_sock;
-+extern struct lttng_ht *ust_app_ht_by_notify_sock;
-
- /* Stream list containing ust_app_stream. */
- struct ust_app_stream_list {
-diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h
-index 0540a5ba9..db85c7ca3 100644
---- a/src/common/mi-lttng.h
-+++ b/src/common/mi-lttng.h
-@@ -110,8 +110,8 @@ extern const char * const mi_lttng_element_save;
-
- /* Strings related to load command */
- extern const char * const mi_lttng_element_load;
--LTTNG_HIDDEN const char * const mi_lttng_element_load_overrides;
--LTTNG_HIDDEN const char * const mi_lttng_element_load_override_url;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_load_overrides;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_load_override_url;
-
- /* General element of mi_lttng */
- extern const char * const mi_lttng_element_empty;
-@@ -186,40 +186,40 @@ extern const char * const mi_lttng_element_snapshot_session_name;
- extern const char * const mi_lttng_element_snapshots;
-
- /* String related to track/untrack command */
--const char * const mi_lttng_element_track_untrack_all_wildcard;
-+extern const char * const mi_lttng_element_track_untrack_all_wildcard;
-
--LTTNG_HIDDEN const char * const mi_lttng_element_session_name;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_session_name;
-
- /* String related to rotate command */
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotate_status;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedules;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic_time_us;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold_bytes;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_result;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_results;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_state;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local_absolute_path;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_host;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_control_port;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_data_port;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_protocol;
--LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_relative_path;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotate_status;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedules;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_periodic;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_periodic_time_us;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_size_threshold;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_size_threshold_bytes;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_result;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_results;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_state;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_local;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_local_absolute_path;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_host;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_control_port;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_data_port;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_protocol;
-+LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_relative_path;
-
- /* String related to enum lttng_rotation_state */
--LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_ongoing;
--LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_completed;
--LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_expired;
--LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_error;
-+LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_ongoing;
-+LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_completed;
-+LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_expired;
-+LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_error;
-
- /* String related to enum lttng_trace_archive_location_relay_protocol_type */
--LTTNG_HIDDEN const char * const mi_lttng_rotation_location_relay_protocol_str_tcp;
-+LTTNG_HIDDEN extern const char * const mi_lttng_rotation_location_relay_protocol_str_tcp;
-
- /* String related to add-context command */
- LTTNG_HIDDEN extern const char * const mi_lttng_element_context_symbol;
-diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c
-index 217c72af4..151e23fb6 100644
---- a/tests/regression/tools/live/live_test.c
-+++ b/tests/regression/tools/live/live_test.c
-@@ -51,9 +51,6 @@
- #define NUM_TESTS 11
- #define mmap_size 524288
-
--int ust_consumerd32_fd;
--int ust_consumerd64_fd;
--
- static int control_sock;
- struct live_session *session;
-
-diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
-index 412e4004f..132488051 100644
---- a/tests/unit/test_kernel_data.c
-+++ b/tests/unit/test_kernel_data.c
-@@ -38,10 +38,6 @@
- int lttng_opt_quiet = 1;
- int lttng_opt_verbose;
- int lttng_opt_mi;
--struct notification_thread_handle *notification_thread_handle;
--
--int ust_consumerd32_fd;
--int ust_consumerd64_fd;
-
- static const char alphanum[] =
- "0123456789"
-diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
-index d01117809..c16695255 100644
---- a/tests/unit/test_session.c
-+++ b/tests/unit/test_session.c
-@@ -44,7 +44,6 @@
- /* Number of TAP tests in this file */
- #define NUM_TESTS 11
-
--struct health_app *health_sessiond;
- static struct ltt_session_list *session_list;
-
- /* For error.h */
-@@ -52,9 +51,6 @@ int lttng_opt_quiet = 1;
- int lttng_opt_verbose = 0;
- int lttng_opt_mi;
-
--int ust_consumerd32_fd;
--int ust_consumerd64_fd;
--
- static const char alphanum[] =
- "0123456789"
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
-index b4e927c9d..a900d1274 100644
---- a/tests/unit/test_ust_data.c
-+++ b/tests/unit/test_ust_data.c
-@@ -47,13 +47,6 @@ int lttng_opt_quiet = 1;
- int lttng_opt_verbose;
- int lttng_opt_mi;
-
--int ust_consumerd32_fd;
--int ust_consumerd64_fd;
--
--/* Global variables required by sessiond objects being linked-in */
--struct lttng_ht *agent_apps_ht_by_sock;
--struct notification_thread_handle *notification_thread_handle;
--
- static const char alphanum[] =
- "0123456789"
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
---
-2.17.1
-
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 4bf6339..9c43a50 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -1,6 +1,4 @@
-# Disable python bindings, swig is broken in rawhide
-#define with_python 0%{!?_without_python:1}
-%define with_python 0
+%define with_python 0%{!?_without_python:1}
%if %{with_python}
%define arg_python --enable-python-bindings
@@ -10,14 +8,13 @@
Name: lttng-tools
-Version: 2.11.0
-Release: 3%{?dist}
+Version: 2.11.1
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
URL: http://lttng.org
Summary: LTTng control and utility programs
Source0: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
Source1: lttng-sessiond.service
-Patch0: 0001-Fix-build-failure-with-fno-common.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -28,6 +25,7 @@ BuildRequires: lttng-ust-devel >= 2.11.0
BuildRequires: lttng-ust-devel < 2.12.0
BuildRequires: popt-devel
BuildRequires: systemd-units
+BuildRequires: systemtap-sdt-devel
BuildRequires: userspace-rcu-devel >= 0.9.0
# For check
@@ -85,6 +83,7 @@ make %{?_smp_mflags} V=1
%install
make DESTDIR=%{buildroot} install
rm -vf %{buildroot}%{_libdir}/*.la
+rm -vf %{buildroot}%{python3_sitearch}/*.la
install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/lttng-sessiond.service
# Install upstream bash auto completion for lttng
install -D -m644 extras/lttng-bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/lttng
@@ -171,6 +170,11 @@ exit 0
%endif
%changelog
+* Fri Feb 07 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.11.1-1
+- New upstream release
+- Re-enable python subpackage
+- Add buildep on systemtap-sdt-devel
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.11.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index e635696..cb0f79a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lttng-tools-2.11.0.tar.bz2) = 2b183296201cc62faa1f5afef3fdb67f089996479987d9e6e52e6286301f57a1015f017cc8b743496c30500579fcabde2945db3b7879ae5bd0a6723cfbdf99fb
+SHA512 (lttng-tools-2.11.1.tar.bz2) = 138f1da618d4cb8a2977066a2c490ed772ecce1c71ba164cad4780be57ab961db74495b04cbf76e1bf6b4933702fefb9aecd761e5e8c6c23ba730656af8b6794
https://src.fedoraproject.org/rpms/lttng-tools/c/564506f5eb91bab2fc35187a...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "Add missing patch"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From bca866f15f44b39c34622e3d53226b151162343d Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: Jan 22 2020 17:28:20 +0000
Subject: Add missing patch
---
diff --git a/0001-Fix-build-failure-with-fno-common.patch b/0001-Fix-build-failure-with-fno-common.patch
new file mode 100644
index 0000000..b7d0479
--- /dev/null
+++ b/0001-Fix-build-failure-with-fno-common.patch
@@ -0,0 +1,255 @@
+From 83f594b319460f9f3f1bb1289c115a7247946863 Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjeanson(a)efficios.com>
+Date: Thu, 16 Jan 2020 14:34:47 -0500
+Subject: [PATCH lttng-tools] Fix: build failure with -fno-common
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 10 will default to building with -fno-common, this inhibits the
+linker from merging multiple tentative definitions of a symbol in an
+archive.
+
+I'm not sure I understand what happen with the symbols in mi-lttng.h
+but a similar issue was adressed in:
+
+ commit 4965f956f3ef47388fb4a1b2f8f504abfe31afe7
+ Author: Jérémie Galarneau <jeremie.galarneau(a)efficios.com>
+ Date: Fri May 22 12:53:30 2015 -0400
+
+ Fix: Mark MI and Config string declarations as extern
+
+ This fixes a build issue with GCC 5.1 which would complain about
+ these symbols being defined multiple times.
+
+Make sure these symbols are extern and defined only in one compile unit.
+
+For more information, see:
+https://gcc.gnu.org/gcc-10/porting_to.html
+
+Change-Id: I139c9695371836cb1011f9ce192080b602ed2fbc
+Signed-off-by: Michael Jeanson <mjeanson(a)efficios.com>
+Signed-off-by: Jérémie Galarneau <jeremie.galarneau(a)efficios.com>
+---
+ src/bin/lttng-consumerd/lttng-consumerd.h | 2 +-
+ src/bin/lttng-sessiond/ust-app.c | 4 ++
+ src/bin/lttng-sessiond/ust-app.h | 6 +--
+ src/common/mi-lttng.h | 58 +++++++++++------------
+ tests/regression/tools/live/live_test.c | 3 --
+ tests/unit/test_kernel_data.c | 4 --
+ tests/unit/test_session.c | 4 --
+ tests/unit/test_ust_data.c | 7 ---
+ 8 files changed, 37 insertions(+), 51 deletions(-)
+
+diff --git a/src/bin/lttng-consumerd/lttng-consumerd.h b/src/bin/lttng-consumerd/lttng-consumerd.h
+index 6d18fdf88..dbbb83e87 100644
+--- a/src/bin/lttng-consumerd/lttng-consumerd.h
++++ b/src/bin/lttng-consumerd/lttng-consumerd.h
+@@ -23,7 +23,7 @@
+ #define NR_LTTNG_CONSUMER_READY 1
+ extern int lttng_consumer_ready;
+
+-const char *tracing_group_name;
++extern const char *tracing_group_name;
+
+ enum lttng_consumer_type lttng_consumer_get_type(void);
+
+diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
+index 205fdad16..f7acbf190 100644
+--- a/src/bin/lttng-sessiond/ust-app.c
++++ b/src/bin/lttng-sessiond/ust-app.c
+@@ -45,6 +45,10 @@
+ #include "notification-thread-commands.h"
+ #include "rotate.h"
+
++struct lttng_ht *ust_app_ht;
++struct lttng_ht *ust_app_ht_by_sock;
++struct lttng_ht *ust_app_ht_by_notify_sock;
++
+ static
+ int ust_app_flush_app_session(struct ust_app *app, struct ust_app_session *ua_sess);
+
+diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
+index 4c8c3cc62..169fc0814 100644
+--- a/src/bin/lttng-sessiond/ust-app.h
++++ b/src/bin/lttng-sessiond/ust-app.h
+@@ -81,7 +81,7 @@ struct ust_register_msg {
+ * Global applications HT used by the session daemon. This table is indexed by
+ * PID using the pid_n node and pid value of an ust_app.
+ */
+-struct lttng_ht *ust_app_ht;
++extern struct lttng_ht *ust_app_ht;
+
+ /*
+ * Global applications HT used by the session daemon. This table is indexed by
+@@ -89,13 +89,13 @@ struct lttng_ht *ust_app_ht;
+ *
+ * The 'sock' in question here is the 'command' socket.
+ */
+-struct lttng_ht *ust_app_ht_by_sock;
++extern struct lttng_ht *ust_app_ht_by_sock;
+
+ /*
+ * Global applications HT used by the session daemon. This table is indexed by
+ * socket using the notify_sock_n node and notify_sock value of an ust_app.
+ */
+-struct lttng_ht *ust_app_ht_by_notify_sock;
++extern struct lttng_ht *ust_app_ht_by_notify_sock;
+
+ /* Stream list containing ust_app_stream. */
+ struct ust_app_stream_list {
+diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h
+index 0540a5ba9..db85c7ca3 100644
+--- a/src/common/mi-lttng.h
++++ b/src/common/mi-lttng.h
+@@ -110,8 +110,8 @@ extern const char * const mi_lttng_element_save;
+
+ /* Strings related to load command */
+ extern const char * const mi_lttng_element_load;
+-LTTNG_HIDDEN const char * const mi_lttng_element_load_overrides;
+-LTTNG_HIDDEN const char * const mi_lttng_element_load_override_url;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_load_overrides;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_load_override_url;
+
+ /* General element of mi_lttng */
+ extern const char * const mi_lttng_element_empty;
+@@ -186,40 +186,40 @@ extern const char * const mi_lttng_element_snapshot_session_name;
+ extern const char * const mi_lttng_element_snapshots;
+
+ /* String related to track/untrack command */
+-const char * const mi_lttng_element_track_untrack_all_wildcard;
++extern const char * const mi_lttng_element_track_untrack_all_wildcard;
+
+-LTTNG_HIDDEN const char * const mi_lttng_element_session_name;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_session_name;
+
+ /* String related to rotate command */
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotate_status;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedules;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic_time_us;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold_bytes;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_result;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_results;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_state;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local_absolute_path;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_host;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_control_port;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_data_port;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_protocol;
+-LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_relative_path;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotate_status;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedules;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_periodic;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_periodic_time_us;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_size_threshold;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_size_threshold_bytes;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_result;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_schedule_results;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_state;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_local;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_local_absolute_path;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_host;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_control_port;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_data_port;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_protocol;
++LTTNG_HIDDEN extern const char * const mi_lttng_element_rotation_location_relay_relative_path;
+
+ /* String related to enum lttng_rotation_state */
+-LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_ongoing;
+-LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_completed;
+-LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_expired;
+-LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_error;
++LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_ongoing;
++LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_completed;
++LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_expired;
++LTTNG_HIDDEN extern const char * const mi_lttng_rotation_state_str_error;
+
+ /* String related to enum lttng_trace_archive_location_relay_protocol_type */
+-LTTNG_HIDDEN const char * const mi_lttng_rotation_location_relay_protocol_str_tcp;
++LTTNG_HIDDEN extern const char * const mi_lttng_rotation_location_relay_protocol_str_tcp;
+
+ /* String related to add-context command */
+ LTTNG_HIDDEN extern const char * const mi_lttng_element_context_symbol;
+diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c
+index 217c72af4..151e23fb6 100644
+--- a/tests/regression/tools/live/live_test.c
++++ b/tests/regression/tools/live/live_test.c
+@@ -51,9 +51,6 @@
+ #define NUM_TESTS 11
+ #define mmap_size 524288
+
+-int ust_consumerd32_fd;
+-int ust_consumerd64_fd;
+-
+ static int control_sock;
+ struct live_session *session;
+
+diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
+index 412e4004f..132488051 100644
+--- a/tests/unit/test_kernel_data.c
++++ b/tests/unit/test_kernel_data.c
+@@ -38,10 +38,6 @@
+ int lttng_opt_quiet = 1;
+ int lttng_opt_verbose;
+ int lttng_opt_mi;
+-struct notification_thread_handle *notification_thread_handle;
+-
+-int ust_consumerd32_fd;
+-int ust_consumerd64_fd;
+
+ static const char alphanum[] =
+ "0123456789"
+diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
+index d01117809..c16695255 100644
+--- a/tests/unit/test_session.c
++++ b/tests/unit/test_session.c
+@@ -44,7 +44,6 @@
+ /* Number of TAP tests in this file */
+ #define NUM_TESTS 11
+
+-struct health_app *health_sessiond;
+ static struct ltt_session_list *session_list;
+
+ /* For error.h */
+@@ -52,9 +51,6 @@ int lttng_opt_quiet = 1;
+ int lttng_opt_verbose = 0;
+ int lttng_opt_mi;
+
+-int ust_consumerd32_fd;
+-int ust_consumerd64_fd;
+-
+ static const char alphanum[] =
+ "0123456789"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
+index b4e927c9d..a900d1274 100644
+--- a/tests/unit/test_ust_data.c
++++ b/tests/unit/test_ust_data.c
+@@ -47,13 +47,6 @@ int lttng_opt_quiet = 1;
+ int lttng_opt_verbose;
+ int lttng_opt_mi;
+
+-int ust_consumerd32_fd;
+-int ust_consumerd64_fd;
+-
+-/* Global variables required by sessiond objects being linked-in */
+-struct lttng_ht *agent_apps_ht_by_sock;
+-struct notification_thread_handle *notification_thread_handle;
+-
+ static const char alphanum[] =
+ "0123456789"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+--
+2.17.1
+
https://src.fedoraproject.org/rpms/lttng-tools/c/bca866f15f44b39c34622e3d...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "Fix session rotation with
kernel domain"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From 6647dca7dcddcaddaf4e2695a114caa4a7f2a0ab Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: Feb 12 2020 19:32:31 +0000
Subject: Fix session rotation with kernel domain
---
diff --git a/0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch b/0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
new file mode 100644
index 0000000..98cc2c3
--- /dev/null
+++ b/0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
@@ -0,0 +1,38 @@
+From 3029bc92f20d249ebea8779e46f6007aa0519b9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
+ <jeremie.galarneau(a)efficios.com>
+Date: Thu, 19 Dec 2019 22:13:10 -0500
+Subject: [PATCH lttng-tools] Fix: sessiond: check for lttng-modules ABI 2.1
+ rather than 2.8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The clear patchset introduces a regression that breaks session
+rotations when the kernel domain is used. The 2.8 lttng-modules ABI
+does not exist yet.
+
+The packet sequence number functionality was introduced in LTTng 2.8,
+which introduced the 2.1 kernel tracer ABI.
+
+Signed-off-by: Jérémie Galarneau <jeremie.galarneau(a)efficios.com>
+Change-Id: Ief97e7e25f6f0fcb5b5b97b39abb417c1eb327ec
+---
+ src/bin/lttng-sessiond/kernel.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/src/bin/lttng-sessiond/kernel.c
++++ b/src/bin/lttng-sessiond/kernel.c
+@@ -1443,9 +1443,10 @@
+ }
+
+ /*
+- * Packet sequence number was introduced in 2.8
++ * Packet sequence number was introduced in LTTng 2.8,
++ * lttng-modules ABI 2.1.
+ */
+- if (abi.major >= 2 && abi.minor >= 8) {
++ if (abi.major >= 2 && abi.minor >= 1) {
+ /* Supported */
+ ret = 1;
+ } else {
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 9c43a50..b598e51 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -9,12 +9,13 @@
Name: lttng-tools
Version: 2.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2
URL: http://lttng.org
Summary: LTTng control and utility programs
Source0: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
Source1: lttng-sessiond.service
+Patch0: 0001-Fix-sessiond-check-for-lttng-modules-ABI-2.1-rather-.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -170,6 +171,9 @@ exit 0
%endif
%changelog
+* Wed Feb 12 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.11.1-2
+- Fix session rotation with kernel domain
+
* Fri Feb 07 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.11.1-1
- New upstream release
- Re-enable python subpackage
https://src.fedoraproject.org/rpms/lttng-tools/c/6647dca7dcddcaddaf4e2695...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "Add patch to fix build
failure with GCC 10"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From e3205fe74e36272757e110d78f8f66b3a43cf923 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: Jan 22 2020 17:24:57 +0000
Subject: Add patch to fix build failure with GCC 10
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 947d3a2..aa9934c 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -11,12 +11,13 @@
Name: lttng-tools
Version: 2.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2
URL: http://lttng.org
Summary: LTTng control and utility programs
Source0: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
Source1: lttng-sessiond.service
+Patch0: 0001-Fix-build-failure-with-fno-common.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -170,6 +171,9 @@ exit 0
%endif
%changelog
+* Wed Jan 22 2020 Michael Jeanson <mjeanson(a)efficios.com> - 2.11.0-2
+- Add patch to fix build failure with GCC 10
+
* Tue Oct 22 2019 Michael Jeanson <mjeanson(a)efficios.com> - 2.11.0-1
- New upstream release
- Disable python subpackage until swig is fixed
https://src.fedoraproject.org/rpms/lttng-tools/c/e3205fe74e36272757e110d7...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "New upstream release 2.11.0"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From 7e69193e07c78bad606055a1d0c61231fad686ba Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: Oct 22 2019 20:29:48 +0000
Subject: New upstream release 2.11.0
---
diff --git a/.gitignore b/.gitignore
index 8c4f75c..a1fb9cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/lttng-tools-2.10.4.tar.bz2
/lttng-tools-2.10.5.tar.bz2
/lttng-tools-2.10.7.tar.bz2
+/lttng-tools-2.11.0.tar.bz2
diff --git a/0001-Fix-namespace-our-gettid-wrapper.patch b/0001-Fix-namespace-our-gettid-wrapper.patch
deleted file mode 100644
index 80c5ea4..0000000
--- a/0001-Fix-namespace-our-gettid-wrapper.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 28bdc78d537266bf33e3f3b56c1b50dce5a22c6b Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson(a)efficios.com>
-Date: Mon, 3 Jun 2019 14:59:08 -0400
-Subject: [PATCH] Fix: namespace our gettid wrapper
-
-Since glibc 2.30, a gettid wrapper was added that conflicts with our
-static declaration. Namespace our wrapper so there is no conflict,
-we'll add support for the glibc provided wrapper in a further commit.
-
-Signed-off-by: Michael Jeanson <mjeanson(a)efficios.com>
----
- src/common/compat/tid.h | 12 +++++++-----
- src/common/error.h | 4 ++--
- 2 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/common/compat/tid.h b/src/common/compat/tid.h
-index 40f562f9..15f9fdc7 100644
---- a/src/common/compat/tid.h
-+++ b/src/common/compat/tid.h
-@@ -29,23 +29,25 @@
- #include <syscall.h>
- #endif
-
--#if defined(_syscall0)
--_syscall0(pid_t, gettid)
--#elif defined(__NR_gettid)
-+#if defined(__NR_gettid)
-+
- #include <unistd.h>
--static inline pid_t gettid(void)
-+static inline pid_t lttng_gettid(void)
- {
- return syscall(__NR_gettid);
- }
-+
- #else
-+
- #include <sys/types.h>
- #include <unistd.h>
-
- /* Fall-back on getpid for tid if not available. */
--static inline pid_t gettid(void)
-+static inline pid_t lttng_gettid(void)
- {
- return getpid();
- }
-+
- #endif
-
- #endif /* LTTNG_TID_H */
-diff --git a/src/common/error.h b/src/common/error.h
-index c90c4ae0..3fe742c0 100644
---- a/src/common/error.h
-+++ b/src/common/error.h
-@@ -151,11 +151,11 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
- /* Three level of debug. Use -v, -vv or -vvv for the levels */
- #define _ERRMSG(msg, type, fmt, args...) __lttng_print(type, msg \
- " - %s [%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", \
-- log_add_time(), (long) getpid(), (long) gettid(), ## args, __func__)
-+ log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args, __func__)
-
- #define _ERRMSG_NO_LOC(msg, type, fmt, args...) __lttng_print(type, msg \
- " - %s [%ld/%ld]: " fmt "\n", \
-- log_add_time(), (long) getpid(), (long) gettid(), ## args)
-+ log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args)
-
- #define MSG(fmt, args...) \
- __lttng_print(PRINT_MSG, fmt "\n", ## args)
---
-2.22.0.rc2
-
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 32e9409..947d3a2 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -1,18 +1,34 @@
+# Disable python bindings, swig is broken in rawhide
+#define with_python 0%{!?_without_python:1}
+%define with_python 0
+
+%if %{with_python}
+ %define arg_python --enable-python-bindings
+%else
+ %define arg_python --disable-python-bindings
+%endif
+
+
Name: lttng-tools
-Version: 2.10.7
-Release: 3%{?dist}
+Version: 2.11.0
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
URL: http://lttng.org
Summary: LTTng control and utility programs
Source0: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
Source1: lttng-sessiond.service
-Patch0: 0001-Fix-namespace-our-gettid-wrapper.patch
-BuildRequires: libuuid-devel popt-devel libtool systemd-units
-BuildRequires: lttng-ust-devel >= 2.10.0
-BuildRequires: userspace-rcu-devel >= 0.8.0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 2.7.6
-BuildRequires: autoconf automake libtool
+BuildRequires: lttng-ust-devel >= 2.11.0
+BuildRequires: lttng-ust-devel < 2.12.0
+BuildRequires: popt-devel
+BuildRequires: systemd-units
+BuildRequires: userspace-rcu-devel >= 0.9.0
+
# For check
#BuildRequires: perl-Test-Harness procps-ng
Requires(pre): shadow-utils
@@ -37,14 +53,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package provides the development files to
implement trace control in external applications
-%package -n python%{python3_pkgversion}-lttng
+%if %{with_python}
+%package -n python3-lttng
Summary: Python bindings for LTTng
-%{?python_provide:%python_provide python%{python3_pkgversion}-lttng}
+%{?python_provide:%python_provide python3-lttng}
BuildRequires: swig
-BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python3-devel
-%description -n python%{python3_pkgversion}-lttng
+%description -n python3-lttng
This package provides Python bindings for LTTng
+%endif
%prep
%autosetup -p1
@@ -54,7 +72,9 @@ This package provides Python bindings for LTTng
autoreconf -vif
touch doc/man/*.1 doc/man/*.3 doc/man/*.8
-%configure --disable-static --enable-python-bindings
+%configure \
+ --disable-static \
+ %{?arg_python}
make %{?_smp_mflags} V=1
@@ -68,11 +88,6 @@ install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/lttng-sessiond.service
# Install upstream bash auto completion for lttng
install -D -m644 extras/lttng-bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/lttng
-%if "%{python3_sitelib}" != "%{python3_sitearch}"
-# Fix the Python module install location
-mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch}
-%endif
-
%pre
getent group tracing >/dev/null || groupadd -r tracing
exit 0
@@ -104,13 +119,16 @@ exit 0
%{_mandir}/man1/lttng-destroy.1.gz
%{_mandir}/man1/lttng-disable-channel.1.gz
%{_mandir}/man1/lttng-disable-event.1.gz
+%{_mandir}/man1/lttng-disable-rotation.1.gz
%{_mandir}/man1/lttng-enable-channel.1.gz
%{_mandir}/man1/lttng-enable-event.1.gz
+%{_mandir}/man1/lttng-enable-rotation.1.gz
%{_mandir}/man1/lttng-help.1.gz
%{_mandir}/man1/lttng-list.1.gz
%{_mandir}/man1/lttng-load.1.gz
%{_mandir}/man1/lttng-metadata.1.gz
%{_mandir}/man1/lttng-regenerate.1.gz
+%{_mandir}/man1/lttng-rotate.1.gz
%{_mandir}/man1/lttng-save.1.gz
%{_mandir}/man1/lttng-set-session.1.gz
%{_mandir}/man1/lttng-snapshot.1.gz
@@ -127,6 +145,7 @@ exit 0
%{_defaultdocdir}/%{name}/README.md
%{_defaultdocdir}/%{name}/ChangeLog
%{_defaultdocdir}/%{name}/live-reading-howto.txt
+%{_defaultdocdir}/%{name}/python-howto.txt
%{_defaultdocdir}/%{name}/quickstart.txt
%{_defaultdocdir}/%{name}/snapshot-howto.txt
%{_defaultdocdir}/%{name}/streaming-howto.txt
@@ -142,14 +161,19 @@ exit 0
%{_libdir}/*.so
%{_libdir}/pkgconfig/lttng-ctl.pc
+%if %{with_python}
%files -n python%{python3_pkgversion}-lttng
%{_defaultdocdir}/%{name}/python-howto.txt
-%{python3_sitearch}/lttng.py
-%{python3_sitearch}/_lttng.la
+%{python3_sitelib}/lttng.py
+%{python3_sitelib}/__pycache__/*.pyc
%{python3_sitearch}/_lttng.so*
-%{python3_sitearch}/__pycache__/lttng.cpython-%{python3_version_nodots}*.pyc
+%endif
%changelog
+* Tue Oct 22 2019 Michael Jeanson <mjeanson(a)efficios.com> - 2.11.0-1
+- New upstream release
+- Disable python subpackage until swig is fixed
+
* Mon Oct 21 2019 Scott K Logan <logans(a)cottsay.net> - 2.10.7-3
- Add python subpackage
diff --git a/sources b/sources
index 0186bf4..e635696 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lttng-tools-2.10.7.tar.bz2) = 1151f8f251d05959e7ec597dfcece2a968887c4551cfb238d30447b0d93b25d23a1cfbc4f3a6651a8c2c7dd95119a0d8886bbe43ff50b28c6c9ca9f4f109d3b7
+SHA512 (lttng-tools-2.11.0.tar.bz2) = 2b183296201cc62faa1f5afef3fdb67f089996479987d9e6e52e6286301f57a1015f017cc8b743496c30500579fcabde2945db3b7879ae5bd0a6723cfbdf99fb
https://src.fedoraproject.org/rpms/lttng-tools/c/7e69193e07c78bad606055a1...
1 year, 10 months
cottsay pushed to lttng-tools (epel9). "Fix Python subpackage on
32-bit platforms"
by notifications@fedoraproject.org
Notification time stamped 2022-06-29 22:38:49 UTC
From 971c032ff28c0aa955fe809bf05fc7c2368c4dcc Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans(a)cottsay.net>
Date: Oct 21 2019 21:49:51 +0000
Subject: Fix Python subpackage on 32-bit platforms
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index b2bfd07..32e9409 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -68,8 +68,10 @@ install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/lttng-sessiond.service
# Install upstream bash auto completion for lttng
install -D -m644 extras/lttng-bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/lttng
+%if "%{python3_sitelib}" != "%{python3_sitearch}"
# Fix the Python module install location
mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch}
+%endif
%pre
getent group tracing >/dev/null || groupadd -r tracing
https://src.fedoraproject.org/rpms/lttng-tools/c/971c032ff28c0aa955fe809b...
1 year, 10 months