Skip to contentSkip to conversation

image_types: add parted-native to do_image_wic depends

PATCH In review Ed Bartosh 2 participants 3 messages Sep 16, 2016 – Sep 27, 2016

lore
Share & tools
lore

Ed Bartosh

author
#0 lore raw

PATCH 1/1 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.

Signed-off-by Ed Bartosh <[email protected]>
---
 meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 +-
 meta/classes/image_types.bbclass                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
meta-selftest/recipes-test/images/wic-image-minimal.bb +1 -1
index 754689f..58bf5a5 100644
@@ -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"
meta/classes/image_types.bbclass +1 -0
index 5ef6f60..0bb6252 100644
@@ -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."""
Signature · 1 line
2.1.4
#1 lore raw
Quoted 6 lines · Ed Bartosh
meta/classes/image_types. renamed from meta/classes/image_types.bbclass +0 -0

bbclass
index 5ef6f60..0bb6252 100644

meta/classes/image_types.bbclass +0 -0
@@ -218,6 +218,7 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH
Quoted 8 lines

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"

This is redundant. image_types.bbclass already sets IMAGE_DEPENDS_wic = "parted-native”.

Signature · 5 lines
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
author
#2 lore raw

PATCH 1/1 image_types.bbclass: remove redundant dependency

Removed parted-native dependency from do_image_wic as it's already mentioned in IMAGE_DEPENDS_wic variable.

Thanks to Christopher Larson for pointing out to this.

Signed-off-by Ed Bartosh <[email protected]>
---
 meta/classes/image_types.bbclass | 1 -
 1 file changed, 1 deletion(-)
meta/classes/image_types.bbclass +0 -1
index 0bb6252..5ef6f60 100644
@@ -218,7 +218,6 @@ 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."""
Signature · 1 line
2.1.4