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...