From 53bcdb21ba257955cdc072c8dae7ec42536503bf Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Tue, 20 Nov 2018 13:03:40 +0100 Subject: image_types_ota.bbclass: move a dependency in Move the dependency do_image_wic -> do_image_ota_ext4 from sota.bbclass to image_types_ota.bbclass, since it's a image specific dependency. Signed-off-by: Ming Liu --- classes/image_types_ota.bbclass | 2 ++ classes/sota.bbclass | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 09f1095..c9d21d1 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -109,3 +109,5 @@ IMAGE_CMD_ota-ext4 () { dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 seek=${OTA_ROOTFS_SIZE} count=$COUNT bs=1024 mkfs.ext4 -O ^64bit ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 -L otaroot -d ${OTA_SYSROOT} } + +do_image_wic[depends] += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '%s:do_image_ota_ext4' % d.getVar('IMAGE_BASENAME', True), '', d)}" diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 7118807..93f59eb 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -1,8 +1,3 @@ -python __anonymous() { - if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): - d.appendVarFlag("do_image_wic", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True)) -} - OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" HOSTTOOLS_NONFATAL += "java" -- cgit v1.2.3-54-g00ecf