diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2019-11-06 19:50:08 +0100 |
|---|---|---|
| committer | Ming Liu <liu.ming50@gmail.com> | 2019-11-06 19:50:08 +0100 |
| commit | d2805472041cf3613ba9e8c14e1f6cd4e600662e (patch) | |
| tree | 988f4ecfc840db03157495f74b8036f1ca8976cc | |
| parent | 2c9eb2c7509e4b8cbe8734c402fdd7db477d9200 (diff) | |
| download | meta-updater-d2805472041cf3613ba9e8c14e1f6cd4e600662e.tar.gz | |
meta: change OTA_IMAGE_ROOTFS to TAR_IMAGE_ROOTFSchange-OTA_IMAGE_ROOTFS-to-TAR_IMAGE_ROOTFS
No functional changes, rename OTA_IMAGE_ROOTFS to TAR_IMAGE_ROOTFS
since the later is a more common name.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
| -rw-r--r-- | classes/image_types_ostree.bbclass | 4 | ||||
| -rw-r--r-- | classes/image_types_ota.bbclass | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 7ffe99d..0e047b1 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -13,11 +13,11 @@ BUILD_OSTREE_TARBALL ??= "1" | |||
| 13 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" | 13 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" |
| 14 | 14 | ||
| 15 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" | 15 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" |
| 16 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${OTA_IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 16 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
| 17 | CONVERSIONTYPES_append = " tar" | 17 | CONVERSIONTYPES_append = " tar" |
| 18 | 18 | ||
| 19 | REQUIRED_DISTRO_FEATURES = "usrmerge" | 19 | REQUIRED_DISTRO_FEATURES = "usrmerge" |
| 20 | OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" | 20 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
| 21 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" | 21 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
| 22 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | 22 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" |
| 23 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" | 23 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 31e3887..2cc8913 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
| @@ -38,7 +38,7 @@ calculate_size () { | |||
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | OTA_SYSROOT = "${WORKDIR}/ota-sysroot" | 40 | OTA_SYSROOT = "${WORKDIR}/ota-sysroot" |
| 41 | OTA_IMAGE_ROOTFS_task-image-ota = "${OTA_SYSROOT}" | 41 | TAR_IMAGE_ROOTFS_task-image-ota = "${OTA_SYSROOT}" |
| 42 | IMAGE_TYPEDEP_ota = "ostreecommit" | 42 | IMAGE_TYPEDEP_ota = "ostreecommit" |
| 43 | do_image_ota[dirs] = "${OTA_SYSROOT}" | 43 | do_image_ota[dirs] = "${OTA_SYSROOT}" |
| 44 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" | 44 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" |
