diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-16 10:32:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-19 17:24:46 +0000 |
commit | fb1654fee44fec04b0f833d375bfdd0f0ed12414 (patch) | |
tree | 2ae7776b914e0d864f91ab4860ea6215062eb7d6 /meta/lib/oeqa/selftest | |
parent | 1da8f52b67ac6ce5819e30530385e5628f11b85f (diff) | |
download | poky-fb1654fee44fec04b0f833d375bfdd0f0ed12414.tar.gz |
image: Fix wic environment issues
The wic environment function needs to run after the rootfs size is
setup. We move this code to a specific task, and depend on that task
from the wic images and other places its needed.
This fixes:
======================================================================
FAIL: test_image_env (oeqa.selftest.wic.Wic)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/utils/decorators.py", line 106, in wrapped_f
return func(*args, **kwargs)
File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/wic.py", line 218, in test_image_env
self.assertTrue(var in content, "%s is not in .env file" % var)
AssertionError: False is not true : ROOTFS_SIZE is not in .env file
(From OE-Core rev: 606f9e2d7d8d389c8d4f5c3090139d3bb780e09c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 55f6f82ab9..df826ed84b 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py | |||
@@ -50,7 +50,7 @@ class Wic(oeSelfTest): | |||
50 | if not Wic.image_is_ready: | 50 | if not Wic.image_is_ready: |
51 | bitbake('syslinux syslinux-native parted-native gptfdisk-native ' | 51 | bitbake('syslinux syslinux-native parted-native gptfdisk-native ' |
52 | 'dosfstools-native mtools-native') | 52 | 'dosfstools-native mtools-native') |
53 | bitbake('core-image-minimal') | 53 | bitbake('core-image-minimal:do_image_complete core-image-minimal:do_rootfs_wicenv') |
54 | Wic.image_is_ready = True | 54 | Wic.image_is_ready = True |
55 | 55 | ||
56 | rmtree(self.resultdir, ignore_errors=True) | 56 | rmtree(self.resultdir, ignore_errors=True) |