[PATCH 1/2] lttng-modules: update to 2.9.1

[PATCH 1/2] lttng-modules: update to 2.9.1

[Nathan Lynch]

This includes a significant fix for kernel tracing on 32-bit systems;
kernel and user space events may be uncorrelated without it.

Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
 .../lttng/{lttng-modules_2.9.0.bb => lttng-modules_2.9.1.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.9.0.bb => lttng-modules_2.9.1.bb} (89%)

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb
similarity index 89%
rename from meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb
index e59d6bc1379c..8e47c6f0a1bc 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb
@@ -13,8 +13,8 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch"
 
-SRC_URI[md5sum] = "717df375ccb6f32bb297cc2f2e692bbf"
-SRC_URI[sha256sum] = "af914e5954081cfb6bd4c6dcf9390474e0c13fe056b12b3dfc86d1b88b8340a0"
+SRC_URI[md5sum] = "5a16bca52233cc2bdff572b1120a88f6"
+SRC_URI[sha256sum] = "62078fe3254ca65969db4b72e59042cd797dbf2740848f8f82384877ae460d54"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 
-- 
2.9.3

[PATCH 2/2] lttng-tools: update to 2.9.4

[Nathan Lynch]

Drop upstreamed patch.

Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
 .../utils-remove-bogus-interpreter.patch           | 35 ----------------------
 .../{lttng-tools_2.9.3.bb => lttng-tools_2.9.4.bb} |  8 ++---
 2 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
 rename meta/recipes-kernel/lttng/{lttng-tools_2.9.3.bb => lttng-tools_2.9.4.bb} (95%)

diff --git a/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
deleted file mode 100644
index f08198208d4f..000000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4545eae3bccb0f5a97509d1405a28000029a8d7d Mon Sep 17 00:00:00 2001
-From: Nathan Lynch <nathan_lynch@mentor.com>
-Date: Mon, 9 Jan 2017 16:14:28 -0600
-Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils shell
- library
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-tests/utils/utils.sh is always sourced, never executed, and
-/src/bin/bash is not a typical path for a shell interpreter.  Just
-delete it.
-
-Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
----
-
-Upstream-Status: Backport
-
- tests/utils/utils.sh | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
-index 05d88650e9f3..9db0640b70f3 100644
---- a/tests/utils/utils.sh
-+++ b/tests/utils/utils.sh
-@@ -1,5 +1,3 @@
--#!/src/bin/bash
--#
- # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
- #
- # This library is free software; you can redistribute it and/or modify it under
--- 
-2.7.4
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.9.4.bb
similarity index 95%
rename from meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.9.4.bb
index 4c11e5b73dc3..fbf3ae985167 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.4.bb
@@ -28,11 +28,11 @@ PACKAGECONFIG_remove_libc-musl = "lttng-ust"
 
 SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://x32.patch \
-           file://utils-remove-bogus-interpreter.patch \
-           file://run-ptest"
+           file://run-ptest \
+           "
 
-SRC_URI[md5sum] = "19fdcc5e9c307ef66581a2743a08a541"
-SRC_URI[sha256sum] = "a6e6baaaa977dcbc9bce6b675881eec664599b86f0d905a7b0b508539407b24e"
+SRC_URI[md5sum] = "10f47abfa214b167580358388428770d"
+SRC_URI[sha256sum] = "3c72456bceef961fad1d0861f07478db16b7659efa69099ba36645da89ca2cc5"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages
 
-- 
2.9.3