summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-08-16 10:06:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-21 15:29:01 +0100
commit779875ad697d54b74268a6efc2fff2642b99ef50 (patch)
treebeea0d0cd0099202a5f091684752d3cf384d7704
parent04414b62a3e2d0547bcd64a7b79eefb43d839dc2 (diff)
downloadopenembedded-core-contrib-779875ad697d54b74268a6efc2fff2642b99ef50.tar.gz
openembedded-core-contrib-779875ad697d54b74268a6efc2fff2642b99ef50.tar.bz2
openembedded-core-contrib-779875ad697d54b74268a6efc2fff2642b99ef50.zip
target-sdk-provides-dummy: extend packages for multilib case
If we have installed some lib32 package which depends on perl/bash, then populating sdk for that image would fail with the following error. Error: Problem: package lib32-libxml-namespacesupport-perl-1.12-r0.corei7_32 requires lib32-perl, but none of the providers can be installed package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts with /usr/bin/perl provided by lib32-perl-5.30.0-r0.corei7_32 package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts with libperl.so.5 provided by lib32-perl-5.30.0-r0.corei7_32 This could be produced by the following steps: 1. IMAGE_INSTALL_append = " lib32-valgrind" 2. bitbake core-image-minimal -c populate_sdk We need to extend all packages in DUMMYPROVIDES to avoid such problems. (From OE-Core rev: 6a38c6aafc2956bb6f7824eff4ac0f630f02da75) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/target-sdk-provides-dummy.bb12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb
index c33cb80321..87b8bfab9c 100644
--- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb
+++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb
@@ -1,6 +1,6 @@
DUMMYARCH = "sdk-provides-dummy-target"
-DUMMYPROVIDES = "\
+DUMMYPROVIDES_PACKAGES = "\
busybox \
busybox-dev \
busybox-src \
@@ -42,15 +42,19 @@ DUMMYPROVIDES = "\
perl-module-threads \
perl-module-warnings \
perl-module-warnings-register \
+ pkgconfig \
+ pkgconfig-dev \
+ pkgconfig-src \
+"
+
+DUMMYPROVIDES = "\
+ ${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])} \
/bin/sh \
/bin/bash \
/usr/bin/env \
/usr/bin/perl \
libperl.so.5 \
libperl.so.5()(64bit) \
- pkgconfig \
- pkgconfig-dev \
- pkgconfig-src \
"
require dummy-sdk-package.inc