]> code.ossystems Code Review - openembedded-core.git/commit
image: Fix wic environment issues
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 16 Jan 2016 10:32:44 +0000 (10:32 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 19 Jan 2016 16:35:37 +0000 (16:35 +0000)
commit606f9e2d7d8d389c8d4f5c3090139d3bb780e09c
tree28b0a463d43886d9ae40d01c1ff27c8fc24b2db0
parentfbdf977a8094bb1e0baca85ffb3ed7f326986639
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>
meta-selftest/recipes-test/images/wic-image-minimal.bb
meta/classes/image.bbclass
meta/classes/image_types.bbclass
meta/lib/oeqa/selftest/wic.py