diff options
author | Alejandro Enedino Hernandez Samaniego <alejandro.enedino.hernandez-samaniego@xilinx.com> | 2018-07-25 09:05:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-01 10:07:22 +0100 |
commit | b7c2c785806e53351340fe27270784115ea172b0 (patch) | |
tree | fa41cc5508624f2b05c061dbc72174931d9b93db /meta/classes | |
parent | 666e0783525a298217787e3d2f1460c57c2f59ca (diff) | |
download | poky-b7c2c785806e53351340fe27270784115ea172b0.tar.gz |
multiconfig: Enable multiconfig dependencies on oe-core
This patch enables multiconfig dependencies (mcdepends) to be used on
recipes using the following format:
task[mcdepends] = "multiconfig:FROM-MC:TO-MC:PN:task-to-depend-on"
For the sake of simplicity consider the following example:
Assuming we have set up multiconfig builds, one for qemux86 and one for
qemuarm, named x86 and arm respectively.
Adding the following line to an image recipe (core-image-sato):
do_image[mcdepends] = "multiconfig:x86:arm:core-image-minimal:do_rootfs"
Would state that core-image-sato:do_image from x86 will depend on
core-image-minimal:do_rootfs from arm so it can be executed.
This patch makes modifications to bitbake.conf to enable mcdepends, and
to sstatesig and staging.bbclass to avoid conflicts between packages from
different multiconfigs.
[YOCTO #10681]
(From OE-Core rev: f71bfe833c657244d2fd07b3b71e86081d7d1c04)
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/staging.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 41df883495..27b012ecbd 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -256,7 +256,7 @@ python extend_recipe_sysroot() { | |||
256 | workdir = d.getVar("WORKDIR") | 256 | workdir = d.getVar("WORKDIR") |
257 | #bb.warn(str(taskdepdata)) | 257 | #bb.warn(str(taskdepdata)) |
258 | pn = d.getVar("PN") | 258 | pn = d.getVar("PN") |
259 | 259 | mc = d.getVar("BB_CURRENT_MC") | |
260 | stagingdir = d.getVar("STAGING_DIR") | 260 | stagingdir = d.getVar("STAGING_DIR") |
261 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" | 261 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" |
262 | recipesysroot = d.getVar("RECIPE_SYSROOT") | 262 | recipesysroot = d.getVar("RECIPE_SYSROOT") |
@@ -443,7 +443,13 @@ python extend_recipe_sysroot() { | |||
443 | 443 | ||
444 | msg_exists = [] | 444 | msg_exists = [] |
445 | msg_adding = [] | 445 | msg_adding = [] |
446 | |||
446 | for dep in configuredeps: | 447 | for dep in configuredeps: |
448 | if mc != 'default': | ||
449 | # We should not care about other multiconfigs | ||
450 | depmc = dep.split(':')[1] | ||
451 | if depmc != mc: | ||
452 | continue | ||
447 | c = setscenedeps[dep][0] | 453 | c = setscenedeps[dep][0] |
448 | if c not in installed: | 454 | if c not in installed: |
449 | continue | 455 | continue |