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 16:35:37 +0000 |
| commit | 606f9e2d7d8d389c8d4f5c3090139d3bb780e09c (patch) | |
| tree | 28b0a463d43886d9ae40d01c1ff27c8fc24b2db0 /meta-selftest | |
| parent | fbdf977a8094bb1e0baca85ffb3ed7f326986639 (diff) | |
| download | openembedded-core-606f9e2d7d8d389c8d4f5c3090139d3bb780e09c.tar.gz openembedded-core-606f9e2d7d8d389c8d4f5c3090139d3bb780e09c.tar.bz2 openembedded-core-606f9e2d7d8d389c8d4f5c3090139d3bb780e09c.zip | |
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
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest')
| -rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index 89451bd200..95c7a9b89a 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -11,7 +11,7 @@ DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-nativ # core-image-minimal is referenced in .wks, so we need its rootfs # to be ready before our rootfs -do_rootfs[depends] += "core-image-minimal:do_rootfs" +do_rootfs[depends] += "core-image-minimal:do_rootfs_wicenv" IMAGE_ROOTFS_EXTRA_SPACE = "2000" |