summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-09-29 16:33:50 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-01 10:05:46 +0000
commit60a9930989c5d88d1b87ecb398788e0b9a60aa09 (patch)
tree3e1e3fc51c45291874c73f9b660b9bf715886aab
parentac7074751696b05d73b1c93cd2b76bc9538813cf (diff)
downloadpoky-60a9930989c5d88d1b87ecb398788e0b9a60aa09.tar.gz
lttng: enable optional building of manpages
(From OE-Core rev: 6ca9b7a56fac1d1b4f087346d3279bfdd50b93a3) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb4
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_git.bb4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index bfc657b3ac..016346fc87 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -26,7 +26,7 @@ PACKAGECONFIG ??= "lttng-ust"
26PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" 26PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
27PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" 27PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
28PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" 28PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
29PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native" 29PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
30PACKAGECONFIG_remove_libc-musl = "lttng-ust" 30PACKAGECONFIG_remove_libc-musl = "lttng-ust"
31 31
32SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ 32SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
@@ -35,7 +35,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
35 35
36S = "${WORKDIR}/git" 36S = "${WORKDIR}/git"
37 37
38inherit autotools-brokensep ptest pkgconfig useradd python3-dir 38inherit autotools-brokensep ptest pkgconfig useradd python3-dir manpages
39 39
40USERADD_PACKAGES = "${PN}" 40USERADD_PACKAGES = "${PN}"
41GROUPADD_PARAM_${PN} = "tracing" 41GROUPADD_PARAM_${PN} = "tracing"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb
index baff71f589..07ce2f4382 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
8 file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ 8 file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
9 file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" 9 file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
10 10
11inherit autotools lib_package 11inherit autotools lib_package manpages
12 12
13DEPENDS = "liburcu util-linux" 13DEPENDS = "liburcu util-linux"
14RDEPENDS_${PN}-bin = "python3-core" 14RDEPENDS_${PN}-bin = "python3-core"
@@ -26,7 +26,7 @@ SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.8 \
26 file://lttng-ust-doc-examples-disable.patch \ 26 file://lttng-ust-doc-examples-disable.patch \
27 " 27 "
28 28
29EXTRA_OECONF += "--disable-man-pages" 29PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
30 30
31do_install_append() { 31do_install_append() {
32 # Patch python tools to use Python 3; they should be source compatible, but 32 # Patch python tools to use Python 3; they should be source compatible, but