diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-04 17:43:41 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-05 12:29:46 +0000 |
| commit | 90cfa16bd4a02ada84ef94f6ae6f182beb8bdc01 (patch) | |
| tree | f1053c3f9556ba5fda35d8b696c5020dcc70e344 /meta/classes/populate_sdk_base.bbclass | |
| parent | aef171f824659b255b0ed2f6430bb757fc26f9c2 (diff) | |
| download | openembedded-core-contrib-90cfa16bd4a02ada84ef94f6ae6f182beb8bdc01.tar.gz | |
populate_sdk_base/image: Fix races for variable mappings
When using the -c populate_sdk option, images are not generated quite as
they should be under certain circumstances. For example the dropbear
feature may not get replaced with openssh, leading to both being installed
with an appropriate rootfs failure.
This patch moves the remapping logic to later points in the code, ensuring
there is no conflict. The result is slightly simpler too as an added bonus.
[YOCTO #3749]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_base.bbclass')
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 88de1e48ac..7af2d2e9e2 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -29,14 +29,9 @@ EXCLUDE_FROM_WORLD = "1" SDK_PACKAGING_FUNC ?= "create_shar" -python () { - # If we don't do this we try and run the mapping hooks while parsing which is slow - # bitbake should really provide something to let us know this... - if bb.data.getVar('BB_WORKERCONTEXT', d, True) is not None: - runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", d) -} - fakeroot python do_populate_sdk() { + runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", d) + bb.build.exec_func("populate_sdk_image", d) # Handle multilibs in the SDK environment, siteconfig, etc files... |