diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2018-11-20 13:03:40 +0100 |
|---|---|---|
| committer | Ming Liu <liu.ming50@gmail.com> | 2018-11-24 14:24:38 +0100 |
| commit | 53bcdb21ba257955cdc072c8dae7ec42536503bf (patch) | |
| tree | ad1237e3bdca9c482e6bef9c780429a1944c87c0 /classes | |
| parent | e97975d6113ca1ffa6cbe9b005bd518bd146fd9c (diff) | |
| download | meta-updater-53bcdb21ba257955cdc072c8dae7ec42536503bf.tar.gz | |
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 <liu.ming50@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ota.bbclass | 2 | ||||
| -rw-r--r-- | classes/sota.bbclass | 5 |
2 files changed, 2 insertions, 5 deletions
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 () { | |||
| 109 | dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 seek=${OTA_ROOTFS_SIZE} count=$COUNT bs=1024 | 109 | dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 seek=${OTA_ROOTFS_SIZE} count=$COUNT bs=1024 |
| 110 | mkfs.ext4 -O ^64bit ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 -L otaroot -d ${OTA_SYSROOT} | 110 | mkfs.ext4 -O ^64bit ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 -L otaroot -d ${OTA_SYSROOT} |
| 111 | } | 111 | } |
| 112 | |||
| 113 | 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 @@ | |||
| 1 | python __anonymous() { | ||
| 2 | if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): | ||
| 3 | d.appendVarFlag("do_image_wic", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True)) | ||
| 4 | } | ||
| 5 | |||
| 6 | OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" | 1 | OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" |
| 7 | 2 | ||
| 8 | HOSTTOOLS_NONFATAL += "java" | 3 | HOSTTOOLS_NONFATAL += "java" |
