mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
oeqa/commands: Fix runqemu after tinfoil data connector changes
Poking changes into config_data and expecting them to appear in the recipe is a bad idea, place the data in recipedata directly instead. (From OE-Core rev: 191dd811900ace0e0af2e97221e10461fae0d9bd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -315,15 +315,15 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
|
||||
try:
|
||||
tinfoil.logger.setLevel(logging.WARNING)
|
||||
import oeqa.targetcontrol
|
||||
tinfoil.config_data.setVar("TEST_LOG_DIR", "${WORKDIR}/testimage")
|
||||
tinfoil.config_data.setVar("TEST_QEMUBOOT_TIMEOUT", "1000")
|
||||
recipedata = tinfoil.parse_recipe(pn)
|
||||
recipedata.setVar("TEST_LOG_DIR", "${WORKDIR}/testimage")
|
||||
recipedata.setVar("TEST_QEMUBOOT_TIMEOUT", "1000")
|
||||
# Tell QemuTarget() whether need find rootfs/kernel or not
|
||||
if launch_cmd:
|
||||
tinfoil.config_data.setVar("FIND_ROOTFS", '0')
|
||||
recipedata.setVar("FIND_ROOTFS", '0')
|
||||
else:
|
||||
tinfoil.config_data.setVar("FIND_ROOTFS", '1')
|
||||
recipedata.setVar("FIND_ROOTFS", '1')
|
||||
|
||||
recipedata = tinfoil.parse_recipe(pn)
|
||||
for key, value in overrides.items():
|
||||
recipedata.setVar(key, value)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user