summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2019-11-07 11:52:13 +0100
committerGitHub <noreply@github.com>2019-11-07 11:52:13 +0100
commit21a463dc264434dc132ae79526a824e7955e0032 (patch)
treeb8018ecc73dad17b061ca3a2c454434d549eaace
parentb98cd8c8a088588b05e1ea38eef81b14606ece37 (diff)
parentd2805472041cf3613ba9e8c14e1f6cd4e600662e (diff)
downloadmeta-updater-21a463dc264434dc132ae79526a824e7955e0032.tar.gz
Merge pull request #626 from liuming50/change-OTA_IMAGE_ROOTFS-to-TAR_IMAGE_ROOTFS
meta: change OTA_IMAGE_ROOTFS to TAR_IMAGE_ROOTFS
-rw-r--r--classes/image_types_ostree.bbclass4
-rw-r--r--classes/image_types_ota.bbclass2
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"
13SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" 13SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}"
14 14
15IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" 15IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
16CONVERSION_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 ]" 16CONVERSION_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 ]"
17CONVERSIONTYPES_append = " tar" 17CONVERSIONTYPES_append = " tar"
18 18
19REQUIRED_DISTRO_FEATURES = "usrmerge" 19REQUIRED_DISTRO_FEATURES = "usrmerge"
20OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" 20TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}"
21do_image_ostree[dirs] = "${OSTREE_ROOTFS}" 21do_image_ostree[dirs] = "${OSTREE_ROOTFS}"
22do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" 22do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}"
23do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" 23do_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
40OTA_SYSROOT = "${WORKDIR}/ota-sysroot" 40OTA_SYSROOT = "${WORKDIR}/ota-sysroot"
41OTA_IMAGE_ROOTFS_task-image-ota = "${OTA_SYSROOT}" 41TAR_IMAGE_ROOTFS_task-image-ota = "${OTA_SYSROOT}"
42IMAGE_TYPEDEP_ota = "ostreecommit" 42IMAGE_TYPEDEP_ota = "ostreecommit"
43do_image_ota[dirs] = "${OTA_SYSROOT}" 43do_image_ota[dirs] = "${OTA_SYSROOT}"
44do_image_ota[cleandirs] = "${OTA_SYSROOT}" 44do_image_ota[cleandirs] = "${OTA_SYSROOT}"