Skip to contentSkip to conversation

lttng-tools: do not install shared libraries in ptest package

PATCH In review Alexander Kanavin 2 participants 3 messages Nov 2, 2016

lore
Share & tools
lore

Alexander Kanavin

author
#0 lore raw

PATCH 1/2 lttng-tools: do not install shared libraries in ptest package

This was creating a race in runtime library dependency resolution where sometimes the library was assumed to be provided by the ptest package.

Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-kernel/lttng/lttng-tools_git.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-kernel/lttng/lttng-tools_git.bb +3 -0
index 016346f..0d2bd00 100644
@@ -113,4 +113,7 @@ do_install_ptest () {
 	# checkpatch.pl is unneeded on target and causes file-rdeps QA
 	# warnings.
 	rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl
+
+        # Remove built libraries as they confuse the packages' runtime dependency resolution
+        rm -rf ${D}${PTEST_PATH}/src/lib/lttng-ctl/.libs/
 }
Signature · 1 line
2.10.1
author
#1 lore raw

PATCH 2/2 populate_sdk_base.bbclass: add documentation packages to SDKs if api-documentation is in DISTRO_FEATURES

Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/classes/populate_sdk_base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/populate_sdk_base.bbclass +1 -1
index 4462b52..a0d3527 100644
@@ -17,7 +17,7 @@ def complementary_globs(featurevar, d):
             globs.append(glob)
     return ' '.join(globs)
 
-SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs"
+SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}"
 SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
 
 inherit rootfs_${IMAGE_PKGTYPE}
Signature · 1 line
2.10.1