Notification time stamped 2022-06-29 22:38:50 UTC
From 8b737d89c49780e3a909c5ca1671a9f1315fe29b Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson(a)efficios.com>
Date: May 19 2021 18:54:52 +0000
Subject: New upstream release 2.12.4
---
diff --git a/.gitignore b/.gitignore
index 667f2b2..33d10fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@
/lttng-tools-2.12.2.tar.bz2
/lttng-tools-2.12.3.tar.bz2
/lttng-tools-2.12.3.tar.bz2.asc
+/lttng-tools-2.12.4.tar.bz2
+/lttng-tools-2.12.4.tar.bz2.asc
diff --git a/0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
b/0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
new file mode 100644
index 0000000..b0d99c7
--- /dev/null
+++ b/0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
@@ -0,0 +1,86 @@
+From 307f5e8b83332cd05692bf2b648c3888681f3e3c Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjeanson(a)efficios.com>
+Date: Tue, 11 May 2021 10:29:50 -0400
+Subject: [PATCH lttng-tools] tests: Move tap-driver.sh out of the autotools
+ aux directory
+
+We have made local modifications to this script, move it to the test
+suite directory so it doesn't get overwritten by an updated version from
+autotools.
+
+Running 'make check' on current RHEL or Fedora without this patch
+results in the following error:
+
+ make[5]: Entering directory
'/builddir/build/BUILD/lttng-tools-2.12.4/tests/regression'
+ tap-driver.sh: invalid option: '--post-script'
+
+Change-Id: I22823176cc5b98901865c9415250ce8e49384cbd
+Signed-off-by: Michael Jeanson <mjeanson(a)efficios.com>
+---
+ configure.ac | 2 --
+ tests/regression/Makefile.am | 2 +-
+ tests/unit/Makefile.am | 2 +-
+ tests/utils/Makefile.am | 2 +-
+ {config => tests/utils}/tap-driver.sh | 0
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ rename {config => tests/utils}/tap-driver.sh (100%)
+
+diff --git a/configure.ac b/configure.ac
+index 9545673c8..572d319c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,8 +15,6 @@ AM_MAINTAINER_MODE([enable])
+ # Enable silent rules if available (Introduced in AM 1.11)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+-AC_REQUIRE_AUX_FILE([tap-driver.sh])
+-
+ # Checks for C compiler
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
+diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
+index 0e9f2576b..73e49c997 100644
+--- a/tests/regression/Makefile.am
++++ b/tests/regression/Makefile.am
+@@ -4,7 +4,7 @@ SUBDIRS = tools kernel ust
+
+ LOG_DRIVER_FLAGS = --merge --post-script $(top_srcdir)/tests/utils/warn_processes.sh
+ LOG_DRIVER = env PGREP='$(PGREP)' AM_TAP_AWK='$(AWK)' $(SHELL) \
+- $(top_srcdir)/config/tap-driver.sh
++ $(top_srcdir)/tests/utils/tap-driver.sh
+
+ TESTS = tools/base-path/test_ust \
+ tools/filtering/test_invalid_filter \
+diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
+index 09de39e8c..87304176e 100644
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
+
+ LOG_DRIVER_FLAGS='--merge'
+ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+- $(top_srcdir)/config/tap-driver.sh
++ $(top_srcdir)/tests/utils/tap-driver.sh
+
+ TESTS = test_kernel_data \
+ test_session \
+diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
+index 893b690ff..c74d10c06 100644
+--- a/tests/utils/Makefile.am
++++ b/tests/utils/Makefile.am
+@@ -4,7 +4,7 @@ SUBDIRS = . tap testapp
+
+ EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_processes.sh \
+ parse-callstack.py
+-dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl
++dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl tap-driver.sh
+ noinst_LTLIBRARIES = libtestutils.la
+
+ libtestutils_la_SOURCES = utils.c utils.h
+diff --git a/config/tap-driver.sh b/tests/utils/tap-driver.sh
+similarity index 100%
+rename from config/tap-driver.sh
+rename to tests/utils/tap-driver.sh
+--
+2.25.1
+
diff --git a/lttng-tools.spec b/lttng-tools.spec
index ae4f068..ea19329 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -8,8 +8,8 @@
Name: lttng-tools
-Version: 2.12.3
-Release: 3%{?dist}
+Version: 2.12.4
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
URL:
http://lttng.org
Summary: LTTng control and utility programs
@@ -19,19 +19,24 @@ Source1:
http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2.as
Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
Source3: lttng-sessiond.service
+Patch0: 0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
+
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libxml2-devel >= 2.7.6
BuildRequires: lttng-ust-devel >= 2.12.0
BuildRequires: lttng-ust-devel < 2.13.0
+BuildRequires: make
BuildRequires: popt-devel
BuildRequires: systemd-units
BuildRequires: systemtap-sdt-devel
BuildRequires: userspace-rcu-devel >= 0.9.0
# For check
-#BuildRequires: perl-Test-Harness procps-ng
+BuildRequires: babeltrace
+BuildRequires: procps-ng
+
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
@@ -60,7 +65,6 @@ Summary: Python bindings for LTTng
%{?python_provide:%python_provide python3-lttng}
BuildRequires: swig
BuildRequires: python3-devel
-BuildRequires: make
%description -n python3-lttng
This package provides Python bindings for LTTng
@@ -174,6 +178,9 @@ exit 0
%endif
%changelog
+* Wed May 19 2021 Michael Jeanson <mjeanson(a)efficios.com> - 2.12.4-1
+- New upstream release
+
* Thu Mar 04 2021 Michael Jeanson <mjeanson(a)efficios.com> - 2.12.3-3
- Install correct lttng-sessiond.service unit file (#1935426)
diff --git a/sources b/sources
index 1ce838b..317149f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (lttng-tools-2.12.3.tar.bz2) =
f997e94a5d6126845b914d8b80a5e1512d49799e84c6cc82903187b988da2b0f157d65d7fe8f14d01fd3b5352aa317c5305bcd6b56f81d03a85a561a18be2a0c
-SHA512 (lttng-tools-2.12.3.tar.bz2.asc) =
bda19fd97f5f7c5fe110418c502539bec79ddb2cc9815b7eee69eccf2ccbd137ee91a3be00f4132b3bc77a77a4ce7dd9c6f098a691b6665629a5acc3bc69bf01
+SHA512 (lttng-tools-2.12.4.tar.bz2) =
8df3c88c7e01a41c2a5e1d80f6791c278be8b7483dd0c4f3357a9b611248beeefff4b7a02afb308550a8e91e188c5d5625a55ffa1de85c49a3a192bb33552dfc
+SHA512 (lttng-tools-2.12.4.tar.bz2.asc) =
9eb79ce50382620f575644dde037d837864c57fd76f00749d3e4d0e7820e9c72d3d9467e3afd9ba8ddde7f7e55978327e63276335d941cc18fbdef9223b9cfbb
https://src.fedoraproject.org/rpms/lttng-tools/c/8b737d89c49780e3a909c5ca...