aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Lynch <nathan_lynch@mentor.com>2017-02-25 22:29:45 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:09 +0000
commit54bd5f79debf30606ce51a43ec3fd9d7c559889e (patch)
treee992648338aefc78f2eb9e944d929eede5c4a8e9
parent7776b51f22791542866789608a135cba83d8881d (diff)
downloadopenembedded-core-contrib-54bd5f79debf30606ce51a43ec3fd9d7c559889e.tar.gz
openembedded-core-contrib-54bd5f79debf30606ce51a43ec3fd9d7c559889e.tar.bz2
openembedded-core-contrib-54bd5f79debf30606ce51a43ec3fd9d7c559889e.zip
lttng-tools: update to 2.9.4
Drop upstreamed patch. Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch35
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.9.4.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb)8
2 files changed, 4 insertions, 39 deletions
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 f08198208d..0000000000
--- 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
index 4c11e5b73d..fbf3ae9851 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