summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2016-09-23 12:58:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-24 07:30:09 +0100
commita9f4b94f4fe4d4c626f3c7cd57582ca4e5b57e8d (patch)
tree694d26c481a2db6067dfac32e4cadd130041f670 /meta
parent7caf628e83c32723c8c1598b88e71df45b651221 (diff)
downloadpoky-a9f4b94f4fe4d4c626f3c7cd57582ca4e5b57e8d.tar.gz
lttng-tools: fixes a wrong header issue
This fixes a following compiling issue: | agent.c:33:19: fatal error: error.h: No such file or directory | #include "error.h" it's back-ported from lttng-tools upstream, we need it in SRC_URI since 2.8 is still the latest release. (From OE-Core rev: 08c9a363cc600cb58ab98cf22de0f7963720dea3) Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch33
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
new file mode 100644
index 0000000000..6c8a9b211a
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
@@ -0,0 +1,33 @@
1From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Wed, 15 Jun 2016 17:18:03 -0400
4Subject: [PATCH] Fix: error.h -> common/error.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Backport
10
11Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
12Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
13Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
14---
15 src/bin/lttng-sessiond/agent.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
19index 7cbbbde..310a7e8 100644
20--- a/src/bin/lttng-sessiond/agent.c
21+++ b/src/bin/lttng-sessiond/agent.c
22@@ -29,7 +29,7 @@
23 #include "agent.h"
24 #include "ust-app.h"
25 #include "utils.h"
26-#include "error.h"
27+#include "common/error.h"
28
29 #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS)
30
31--
321.9.1
33
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index 66269d8957..84cac84978 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -28,6 +28,7 @@ PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-nat
28PACKAGECONFIG_remove_libc-musl = "lttng-ust" 28PACKAGECONFIG_remove_libc-musl = "lttng-ust"
29 29
30SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ 30SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
31 file://0001-Fix-error.h-common-error.h.patch \
31 file://runtest-2.4.0.patch \ 32 file://runtest-2.4.0.patch \
32 file://run-ptest" 33 file://run-ptest"
33 34