diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-09-16 17:32:53 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-20 15:11:08 +0100 |
commit | 69005ae65c95976d41ebb377a80433cb32d53b37 (patch) | |
tree | 911f200b54cb6310885e66d9daec0bcbdb334996 | |
parent | 9ead92a00fd35a7c4adf019b22b76dde9ec6427e (diff) | |
download | poky-69005ae65c95976d41ebb377a80433cb32d53b37.tar.gz |
image_types: add parted-native to do_image_wic depends
As parted is always used by wic it makes sense to make do_image_wic
dependent on parted-native:do_populate_sysroot. This should help
to avoid adding it to all wic image recipes.
(From OE-Core rev: c687c9fcc010947f52e1cd153ea74ae5f6343ca4)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 | ||||
-rw-r--r-- | meta/classes/image_types.bbclass | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index 754689f999..58bf5a553c 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb | |||
@@ -7,7 +7,7 @@ IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" | |||
7 | IMAGE_FSTYPES = "wic" | 7 | IMAGE_FSTYPES = "wic" |
8 | RM_OLD_IMAGE = "1" | 8 | RM_OLD_IMAGE = "1" |
9 | 9 | ||
10 | DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native gptfdisk-native" | 10 | DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" |
11 | 11 | ||
12 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 12 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
13 | 13 | ||
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 5ef6f60b89..0bb6252430 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -218,6 +218,7 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" | |||
218 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" | 218 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" |
219 | WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" | 219 | WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" |
220 | do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" | 220 | do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" |
221 | do_image_wic[depends] += "parted-native:do_populate_sysroot" | ||
221 | 222 | ||
222 | python do_write_wks_template () { | 223 | python do_write_wks_template () { |
223 | """Write out expanded template contents to WKS_FULL_PATH.""" | 224 | """Write out expanded template contents to WKS_FULL_PATH.""" |