diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-18 19:10:49 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:05:17 +0000 |
| commit | 06a450000464ece1da9daf31081641b9af20e227 (patch) | |
| tree | cec03585efe06f8c45f29cdd9deb1b82a755a844 | |
| parent | c13943dbf91b3a6be0fda338c743b59763253777 (diff) | |
| download | poky-06a450000464ece1da9daf31081641b9af20e227.tar.gz | |
image_types.bbclass: build wic-tools
Added dependency do_image_wic -> wic-tools:do_build to ensure
that all required tools are ready to use by wic.
(From OE-Core rev: 9f547605d2bec282c5679fb35cd5b28a37c5a0d5)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image_types.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 7748dee8eb..ff5e7278ce 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
| @@ -226,6 +226,7 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" | |||
| 226 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" | 226 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" |
| 227 | WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" | 227 | WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" |
| 228 | do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" | 228 | do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" |
| 229 | do_image_wic[depends] += "wic-tools:do_build" | ||
| 229 | 230 | ||
| 230 | python () { | 231 | python () { |
| 231 | if d.getVar('USING_WIC') and 'do_bootimg' in d: | 232 | if d.getVar('USING_WIC') and 'do_bootimg' in d: |