From bbff6b07256d63d318066eb1357763467532dd70 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Wed, 27 Jul 2016 01:02:03 -0400 Subject: perf: enable man pages for 'help' functionality When using 'perf help ', it can't find 'man' command and pages for perf. The perf man pages depends on the xmlto-native and asciidoc-native, so we just need to add the two packages to the DEPENDS variable and add 'man'to RDEPENDS_perf-doc. Signed-off-by: Dengke Du Signed-off-by: Ross Burton --- meta/recipes-kernel/perf/perf.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 171d23f454..1e84a2231b 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -30,6 +30,8 @@ DEPENDS = " \ ${SCRIPTING_DEPENDS} \ ${LIBUNWIND_DEPENDS} \ bison flex xz \ + xmlto-native \ + asciidoc-native \ " do_configure[depends] += "virtual/kernel:do_shared_workdir" @@ -90,7 +92,6 @@ EXTRA_OEMAKE += "\ 'sharedir=${datadir}' \ 'sysconfdir=${sysconfdir}' \ 'perfexecdir=${libexecdir}/perf-core' \ - \ 'ETC_PERFCONFIG=${@os.path.relpath(sysconfdir, prefix)}' \ 'sharedir=${@os.path.relpath(datadir, prefix)}' \ 'mandir=${@os.path.relpath(mandir, prefix)}' \ @@ -138,6 +139,13 @@ do_configure_prepend () { -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ ${S}/tools/perf/config/Makefile fi + # The man pages installation is "$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)" + # in ${S}/tools/perf/Documentation/Makefile, if the mandir set to '?=', it + # will use the relative path 'share/man', in the way it will resulting in + # incorrect installation for man pages. + if [ -e "${S}/tools/perf/Documentation/Makefile" ]; then + sed -i 's,^mandir?=,mandir:=,' ${S}/tools/perf/Documentation/Makefile + fi if [ -e "${S}/tools/perf/Makefile.perf" ]; then sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ ${S}/tools/perf/Makefile.perf @@ -197,6 +205,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" RDEPENDS_${PN} += "elfutils bash" +RDEPENDS_${PN}-doc += "man" RDEPENDS_${PN}-archive =+ "bash" RDEPENDS_${PN}-python =+ "bash python python-modules" RDEPENDS_${PN}-perl =+ "bash perl perl-modules" -- cgit v1.2.3