From be90c3ec5cabc64a63488b9e1bf1879155b43a6a Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 1 Jul 2016 14:27:08 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 72e8ed34d5..f7de756b71 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 = "" -- cgit v1.2.3-54-g00ecf