diff options
| author |   Mariano Lopez <mariano.lopez@linux.intel.com> | 2015-12-30 06:52:54 +0000 |
|---|---|---|
| committer |   Joshua Lock <joshua.g.lock@intel.com> | 2016-03-03 11:02:45 +0000 |
| commit | 91d4706d356659e46923a8314f1a2aa259ead4fe (patch) | |
| tree | b62e34e0a33b797931ecba083406d8edd4923180 /meta/classes | |
| parent | cb5c5d950a83b85881eeadc0362230fa2720962f (diff) | |
| download | openembedded-core-contrib-91d4706d356659e46923a8314f1a2aa259ead4fe.tar.gz | |
image_types.bbclass: Rebuild when WICVARS change
The procces to do a wic image is to save a file with
variables required by wic and then call wic using this
file. Because this is external to bitbake if the vars
change, the image won't be rebuild; an example of such
is IMAGE_BOOT_FILES.
This patch adds these variables to vardeps of do_rootfs
when a wic image is build. This will rebuild the image
if a variable needed by wic changes.
[YOCTO #8693]
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(From OE-Core master rev: 12c54d50ed4c321dc272beb3c6cb770965c979f1)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image_types.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index afe8d0cd8f..dea3bb0ede 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -198,9 +198,10 @@ IMAGE_CMD_wic () { } IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" -# Rebuild when the wks file changes +# Rebuild when the wks file or vars in WICVARS change USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}" do_rootfs[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" +do_rootfs[vardeps] += "${@bb.utils.contains("USING_WIC", "1", "${WICVARS}", "", d)}" EXTRA_IMAGECMD = "" |