diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-24 11:58:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-24 22:01:03 +0000 |
commit | 1f0d37436f031aceaf9561d424c342d92afd91a4 (patch) | |
tree | 11d760dcf3f509c7b14deacf99672cdeb3c0c318 /meta/lib | |
parent | 4e7d13232a97f18fc99f96081292aec3ea3a5d94 (diff) | |
download | poky-1f0d37436f031aceaf9561d424c342d92afd91a4.tar.gz |
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>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/utils/commands.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index dc1e286dac..f1679875dc 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py | |||
@@ -315,15 +315,15 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, | |||
315 | try: | 315 | try: |
316 | tinfoil.logger.setLevel(logging.WARNING) | 316 | tinfoil.logger.setLevel(logging.WARNING) |
317 | import oeqa.targetcontrol | 317 | import oeqa.targetcontrol |
318 | tinfoil.config_data.setVar("TEST_LOG_DIR", "${WORKDIR}/testimage") | 318 | recipedata = tinfoil.parse_recipe(pn) |
319 | tinfoil.config_data.setVar("TEST_QEMUBOOT_TIMEOUT", "1000") | 319 | recipedata.setVar("TEST_LOG_DIR", "${WORKDIR}/testimage") |
320 | recipedata.setVar("TEST_QEMUBOOT_TIMEOUT", "1000") | ||
320 | # Tell QemuTarget() whether need find rootfs/kernel or not | 321 | # Tell QemuTarget() whether need find rootfs/kernel or not |
321 | if launch_cmd: | 322 | if launch_cmd: |
322 | tinfoil.config_data.setVar("FIND_ROOTFS", '0') | 323 | recipedata.setVar("FIND_ROOTFS", '0') |
323 | else: | 324 | else: |
324 | tinfoil.config_data.setVar("FIND_ROOTFS", '1') | 325 | recipedata.setVar("FIND_ROOTFS", '1') |
325 | 326 | ||
326 | recipedata = tinfoil.parse_recipe(pn) | ||
327 | for key, value in overrides.items(): | 327 | for key, value in overrides.items(): |
328 | recipedata.setVar(key, value) | 328 | recipedata.setVar(key, value) |
329 | 329 | ||