summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
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:19 +0000
commitc7d8f854a348347215da217ff84c8ffdbb6aea9a (patch)
tree21f09df68cb154dbef0ea9cea0c3cde2d6142124 /meta/recipes-kernel
parent8cf7d4525da44981492fbb9ed9bf0c4cdb889d2f (diff)
downloadpoky-c7d8f854a348347215da217ff84c8ffdbb6aea9a.tar.gz
lttng-tools: update to 2.9.4
Drop upstreamed patch. (From OE-Core rev: 54bd5f79debf30606ce51a43ec3fd9d7c559889e) Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-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 @@
1From 4545eae3bccb0f5a97509d1405a28000029a8d7d Mon Sep 17 00:00:00 2001
2From: Nathan Lynch <nathan_lynch@mentor.com>
3Date: Mon, 9 Jan 2017 16:14:28 -0600
4Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils shell
5 library
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10tests/utils/utils.sh is always sourced, never executed, and
11/src/bin/bash is not a typical path for a shell interpreter. Just
12delete it.
13
14Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
15Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
16---
17
18Upstream-Status: Backport
19
20 tests/utils/utils.sh | 2 --
21 1 file changed, 2 deletions(-)
22
23diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
24index 05d88650e9f3..9db0640b70f3 100644
25--- a/tests/utils/utils.sh
26+++ b/tests/utils/utils.sh
27@@ -1,5 +1,3 @@
28-#!/src/bin/bash
29-#
30 # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
31 #
32 # This library is free software; you can redistribute it and/or modify it under
33--
342.7.4
35
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"
28 28
29SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ 29SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
30 file://x32.patch \ 30 file://x32.patch \
31 file://utils-remove-bogus-interpreter.patch \ 31 file://run-ptest \
32 file://run-ptest" 32 "
33 33
34SRC_URI[md5sum] = "19fdcc5e9c307ef66581a2743a08a541" 34SRC_URI[md5sum] = "10f47abfa214b167580358388428770d"
35SRC_URI[sha256sum] = "a6e6baaaa977dcbc9bce6b675881eec664599b86f0d905a7b0b508539407b24e" 35SRC_URI[sha256sum] = "3c72456bceef961fad1d0861f07478db16b7659efa69099ba36645da89ca2cc5"
36 36
37inherit autotools ptest pkgconfig useradd python3-dir manpages 37inherit autotools ptest pkgconfig useradd python3-dir manpages
38 38