From 12c54d50ed4c321dc272beb3c6cb770965c979f1 Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Wed, 30 Dec 2015 06:52:54 +0000 Subject: 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 Signed-off-by: Ross Burton --- meta/classes/image_types.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') 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 = "" -- cgit v1.2.3