sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

image.bbclass: run wicenv task only for wic images 

Currently do_wicenv task is run for all images. However, its
result is used only to produce wic image. It's better to
run this task only for wic images. If another rootfs is
required to produce wic image, dependency to its do_wicenv
must be added to the wic image recipy.

Stopped running do_wicenv for all images. Added explicit
dependency to this task in wic-image-minimal recipe.

[YOCTO #9095]

(From OE-Core rev: b81c176fb2f1ee818b6049c39ef353a7d7d5e078)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2016-03-23 11:09:18 +02:00 committed by Richard Purdie
parent 5cb7705d05
commit d6cb46cafd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-selftest/recipes-test/images/wic-image-minimal.bb
View File

@ -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_wicenv"
do_rootfs[depends] += "core-image-minimal:do_image core-image-minimal:do_rootfs_wicenv"
IMAGE_ROOTFS_EXTRA_SPACE = "2000"

2
meta/classes/image.bbclass
View File

@ -275,7 +275,7 @@ python do_rootfs_wicenv () {
if value:
envf.write('%s="%s"\n' % (var, value.strip()))
}
addtask do_rootfs_wicenv after do_image before do_image_wic do_image_complete
addtask do_rootfs_wicenv after do_image before do_image_wic
do_rootfs_wicenv[vardeps] += "${WICVARS}"
do_rootfs_wicenv[prefuncs] = 'set_image_size'