Skip to contentSkip to conversation

lttng: enable optional building of manpages

PATCH In review Alexander Kanavin 1 participant 3 messages Nov 2, 2016

lore
Share & tools
lore

Alexander Kanavin

author
#0 lore raw

PATCH 1/2 lttng: enable optional building of manpages

(From OE-Core rev: 6ca9b7a56fac1d1b4f087346d3279bfdd50b93a3)

Signed-off-by Alexander Kanavin <[email protected]>
Signed-off-by Ross Burton <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
 meta/recipes-kernel/lttng/lttng-tools_git.bb | 4 ++--
 meta/recipes-kernel/lttng/lttng-ust_git.bb   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_git.bb +2 -2
index bfc657b..016346f 100644
@@ -26,7 +26,7 @@ PACKAGECONFIG ??= "lttng-ust"
 PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
 PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
 PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
-PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native"
+PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
 PACKAGECONFIG_remove_libc-musl = "lttng-ust"
 
 SRC_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 \
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep ptest pkgconfig useradd python3-dir
+inherit autotools-brokensep ptest pkgconfig useradd python3-dir manpages
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "tracing"
meta/recipes-kernel/lttng/lttng-ust_git.bb +2 -2
index baff71f..07ce2f4 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
                     file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
                     file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
 
-inherit autotools lib_package
+inherit autotools lib_package manpages
 
 DEPENDS = "liburcu util-linux"
 RDEPENDS_${PN}-bin = "python3-core"

@@ -26,7 +26,7 @@ SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.8 \
            file://lttng-ust-doc-examples-disable.patch \
           "
 
-EXTRA_OECONF += "--disable-man-pages"
+PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
 
 do_install_append() {
         # Patch python tools to use Python 3; they should be source compatible, but
Signature · 1 line
2.10.1
author
#1 lore raw

PATCH 2/2 oeqa/selftest/kernel.py: Add new file destined for kernel related tests

From: Costin Constantin <[email protected]>

[YP#7202]: Test for linux-dummy
The new kernel.py file is intended for kernel related test cases. The test for linux-dummy will ensure it is in good shape and can be used as a kernel replacement at build time. To do this, the test will first clean sstate for linux-dummy target, ensuring no file is present in the stamps directory. After, core-image-minimal is built, ensuring linux-dummy can be used as a kernel substitute.

(From OE-Core rev: 98c6ebf1e05158c689e01b785d32757847cdb10c)

Signed-off-by Costin Constantin <[email protected]>
Signed-off-by Ross Burton <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/lib/oeqa/selftest/kernel.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 meta/lib/oeqa/selftest/kernel.py
meta/lib/oeqa/selftest/kernel.py new file +29 -0
new file mode 100644
index 0000000..3fe3517
@@ -0,0 +1,29 @@
+import os
+import oeqa.utils.ftools as ftools
+from oeqa.selftest.base import oeSelfTest
+from oeqa.utils.commands import runCmd, bitbake, get_bb_var
+from oeqa.utils.decorators import testcase
+
+class KernelTests(oeSelfTest):
+    def  test_dummy_kernel(self):
+        """
+        [YP#7202]
+        - test that linux-dummy target can be used as kernel provider for an image
+        - check no "multiple providers are available for" message is received while building the image
+        """
+        config_param = 'PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"'
+        self.append_config(config_param)
+        arch_dir = get_bb_var('MULTIMACH_TARGET_SYS', target='linux-dummy')
+        stamps_dir = os.path.join(os.getenv('BUILDDIR'), "tmp/stamps")
+        lnx_dmy_stamps_dir = os.path.join(stamps_dir, arch_dir, 'linux-dummy')
+        res = bitbake("linux-dummy -ccleansstate") # ensure we have nothing related to linux-dummy in stamps dir.
+        self.assertFalse(os.listdir(lnx_dmy_stamps_dir), msg='linux-dummy stamps dir. should have been cleaned. Something \
+                         happened with bitbake linux-dummy -ccleansstate')
+        res = bitbake("core-image-minimal")# testing linux-dummy is both buildable and usable within an image
+        self.remove_config(config_param)
+        self.assertEqual(res.status, 0, msg="core-image-minimal failed to build. Please check logs. ")
+        self.assertNotIn("multiple providers are available for", res.output, msg="'multiple providers are available for\
+                        linux-dummy' message received during buildtime.")
+        self.assertTrue(os.listdir(lnx_dmy_stamps_dir), msg="linux-dummy didn't build correctly. No stamp present in stamps \
+                        dir. %s" % lnx_dmy_stamps_dir)
+
Signature · 1 line
2.10.1