[oe-commits] [openembedded-core] 03/07: image_types.bbclass: Rebuild when WICVARS change

[git at git.openembedded.org]

rpurdie pushed a commit to branch jethro
in repository openembedded-core.

commit 91d4706d356659e46923a8314f1a2aa259ead4fe
Author: Mariano Lopez <mariano.lopez at linux.intel.com>
AuthorDate: Wed Dec 30 06:52:54 2015 +0000

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    
    (From OE-Core master rev: 12c54d50ed4c321dc272beb3c6cb770965c979f1)
    Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
---
 meta/classes/image_types.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index afe8d0c..dea3bb0 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 = ""
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.