populate_sdk_base/image: Fix races for variable mappings
PATCH 1/1 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]
---
meta/classes/image.bbclass +4 -13
@@ -117,6 +117,10 @@ python () { d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) + if d.getVar('BB_WORKERCONTEXT', True) is not None: + runtime_mapping_rename("PACKAGE_INSTALL", d) + runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) + # Ensure we have the vendor list for complementary package handling ml_vendor_list = "" multilibs = d.getVar('MULTILIBS', True) or ""
@@ -129,19 +133,6 @@ python () { d.setVar('MULTILIB_VENDORS', ml_vendor_list) } -python image_handler () { - if not isinstance(e, bb.event.RecipeParsed): - return - - # 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 e.data.getVar('BB_WORKERCONTEXT', True) is not None: - runtime_mapping_rename("PACKAGE_INSTALL", e.data) - runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", e.data) - -} -addhandler image_handler - # # Get a list of files containing device tables to create. # * IMAGE_DEVICE_TABLE is the old name to an absolute path to a device table file
meta/classes/populate_sdk_base.bbclass +2 -7
@@ -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...
Quoted 9 lines · Richard Purdie
When using the -c
populate_sdkoption, 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]
Just an FYI, I verified this corrects the reported issue with the core-image-sato-sdk as indicated in the defect.
Quoted 1 line
Signed-off-by Richard Purdie <[email protected]>
Quoted 65 lines
---
meta/classes/image.bbclass +4
-13@@ -117,6 +117,10 @@ python () { d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) + if d.getVar('BB_WORKERCONTEXT', True) is not None: + runtime_mapping_rename("PACKAGE_INSTALL", d) + runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) + # Ensure we have the vendor list for complementary package handling ml_vendor_list = "" multilibs = d.getVar('MULTILIBS', True) or ""@@ -129,19 +133,6 @@ python () { d.setVar('MULTILIB_VENDORS', ml_vendor_list) } -python image_handler () { - if not isinstance(e, bb.event.RecipeParsed): - return - - # 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 e.data.getVar('BB_WORKERCONTEXT', True) is not None: - runtime_mapping_rename("PACKAGE_INSTALL", e.data) - runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", e.data) - -} -addhandler image_handler - # # Get a list of files containing device tables to create. # * IMAGE_DEVICE_TABLE is the old name to an absolute path to a device table filemeta/classes/populate_sdk_base.bbclass +2
-7@@ -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..._______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core