From 69005ae65c95976d41ebb377a80433cb32d53b37 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 16 Sep 2016 17:32:53 +0300 Subject: [PATCH] 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 +- meta/classes/image_types.bbclass | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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}" IMAGE_FSTYPES = "wic" RM_OLD_IMAGE = "1" -DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native gptfdisk-native" +DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 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" USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" 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}" +do_image_wic[depends] += "parted-native:do_populate_sysroot" python do_write_wks_template () { """Write out expanded template contents to WKS_FULL_PATH."""