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

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

[Alexander Kanavin]

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 <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/lttng/lttng-tools_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index 016346f..0d2bd00 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -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/
 }
-- 
2.10.1

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

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/populate_sdk_base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 4462b52..a0d3527 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -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}
-- 
2.10.1

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

[Nathan Lynch]

On 11/02/2016 11:09 AM, Alexander Kanavin wrote:
> 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 <alexander.kanavin@linux.intel.com>

FWIW:

Acked-by: Nathan Lynch <nathan_lynch@mentor.com>

Can this be applied to the morty branch after it hits master?