Rebuild when WICVARS change

From: Mariano Lopez <[email protected]>

This patch adds these WICVARS to vardeps of do_rootfs when a wic image is build. This will trigger a rebuild when a variable needed by WIC changes.

The following changes since commit 2cd061a29a94fdcdfec86732e6bcbb71c12c4afc:

bluez5: include the patch only for 5.36 (2015-12-28 13:02:11 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib mariano/bug8693
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mariano/bug8693

Mariano Lopez (1):
image_types.bbclass: Rebuild when WICVARS change

 meta/classes/image_types.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

1.8.4.5

From: Mariano Lopez <[email protected]>

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]

---
 meta/classes/image_types.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index afe8d0c..dea3bb0 100644
@@ -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 = ""
 

1.8.4.5