From: Christopher Larson <chris_larson@mentor.com>
Date: Fri, 1 Jul 2016 21:27:08 +0000 (-0700)
Subject: image_types.bbclass: add intermediate var for WKS_FILE_CHECKSUM
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be90c3ec5cabc64a63488b9e1bf1879155b43a6a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

image_types.bbclass: add intermediate var for WKS_FILE_CHECKSUM

This is a bit nicer to work with, and easier to override.

(From OE-Core rev: 44f1d3cc613563b8d5be61a2648d0cd336fea728)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 72e8ed34d5a..f7de756b71b 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -215,7 +215,8 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES"
 
 # 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_image_wic[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}"
+WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}"
+do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}"
 
 EXTRA_IMAGECMD = ""