diff options
| author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2015-12-30 06:52:54 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:10 +0000 |
| commit | 12c54d50ed4c321dc272beb3c6cb770965c979f1 (patch) | |
| tree | 5821747df55e59496cb5047b570b42d91d5bcb58 | |
| parent | 9f3e6d811d9a360dc41031838431edcd2e226f3d (diff) | |
| download | openembedded-core-12c54d50ed4c321dc272beb3c6cb770965c979f1.tar.gz openembedded-core-12c54d50ed4c321dc272beb3c6cb770965c979f1.tar.bz2 openembedded-core-12c54d50ed4c321dc272beb3c6cb770965c979f1.zip | |
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>
| -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 = "" |