diff options
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_git.bb | 1 |
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 @@ +From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Wed, 15 Jun 2016 17:18:03 -0400 +Subject: [PATCH] Fix: error.h -> common/error.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> +Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com> +--- + src/bin/lttng-sessiond/agent.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c +index 7cbbbde..310a7e8 100644 +--- a/src/bin/lttng-sessiond/agent.c ++++ b/src/bin/lttng-sessiond/agent.c +@@ -29,7 +29,7 @@ + #include "agent.h" + #include "ust-app.h" + #include "utils.h" +-#include "error.h" ++#include "common/error.h" + + #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS) + +-- +1.9.1 + 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 PACKAGECONFIG_remove_libc-musl = "lttng-ust" SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ + file://0001-Fix-error.h-common-error.h.patch \ file://runtest-2.4.0.patch \ file://run-ptest" |