summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-03-11 15:22:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-12 22:49:28 +0000
commit3fbc48a1d838ce1f0ffc7d8fbc4e34e9f847fe01 (patch)
tree2e58e6c3c449e481a78022a478de1fb5a0b35220 /meta/recipes-kernel/lttng
parentcfe7c719adc085e39b677d5c31beb6306d1fe0da (diff)
downloadpoky-3fbc48a1d838ce1f0ffc7d8fbc4e34e9f847fe01.tar.gz
babletrace2: make manpages multilib identical
(From OE-Core rev: 67d38c62b4a02a1ee1b6d751fa0f2483dafa2fb1) Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch28
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
new file mode 100644
index 0000000000..2401b176e6
--- /dev/null
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
@@ -0,0 +1,28 @@
1From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Mon, 9 Mar 2020 21:10:35 +0000
4Subject: [PATCH] Make manpages multilib identical
5
6Upstream-Status: Pending
7Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
8---
9 doc/man/asciidoc-attrs.conf.in | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in
13index ad1183f1..e11c7031 100644
14--- a/doc/man/asciidoc-attrs.conf.in
15+++ b/doc/man/asciidoc-attrs.conf.in
16@@ -1,7 +1,7 @@
17 [attributes]
18 # default values
19-system_plugin_path="@LIBDIR@/babeltrace2/plugins"
20-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers"
21+system_plugin_path="@prefix@/lib*/babeltrace2/plugins"
22+system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers"
23 babeltrace_version="@PACKAGE_VERSION@"
24 enable_debug_info="@ENABLE_DEBUG_INFO_VAL@"
25 defrdport=5344
26--
272.24.1
28
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
index 16953d6807..61bc7f5e6b 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
@@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
10SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ 10SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \
11 file://run-ptest \ 11 file://run-ptest \
12 file://0001-tests-do-not-run-test-applications-from-.libs.patch \ 12 file://0001-tests-do-not-run-test-applications-from-.libs.patch \
13 file://0001-Make-manpages-multilib-identical.patch \
13 " 14 "
14SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" 15SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910"
15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" 16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"