summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorOYTIS <tossel@gmail.com>2018-10-25 17:31:34 +0200
committerGitHub <noreply@github.com>2018-10-25 17:31:34 +0200
commitd2ca4d8b48a88570b612154703562b55b55ce0ca (patch)
tree383a4b7e1ef89e777c334cbb03e9b4f11e56bb49 /classes
parentce96109093527808be935313cde400973862e2de (diff)
parentf07be1805cc22b5428ff529b705731360b485d06 (diff)
downloadmeta-updater-d2ca4d8b48a88570b612154703562b55b55ce0ca.tar.gz
Merge pull request #410 from agners/use-imgdeploydir
Use IMGDEPLOYDIR
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ota.bbclass15
1 files changed, 3 insertions, 12 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 929d092..ed1d579 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -136,21 +136,12 @@ IMAGE_CMD_ota-ext4 () {
136 eval COUNT=\"$MIN_COUNT\" 136 eval COUNT=\"$MIN_COUNT\"
137 fi 137 fi
138 138
139 rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg 139 dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 seek=${OTA_ROOTFS_SIZE} count=$COUNT bs=1024
140 sync 140 mkfs.ext4 -O ^64bit ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 -L otaroot -d ${OTA_SYSROOT}
141 dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg seek=${OTA_ROOTFS_SIZE} count=$COUNT bs=1024
142 mkfs.ext4 -O ^64bit ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg -L otaroot -d ${OTA_SYSROOT}
143 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
144 ln -s ${IMAGE_NAME}.otaimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
145} 141}
146 142
147IMAGE_CMD_ota-tar () { 143IMAGE_CMD_ota-tar () {
148 rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg.tar 144 tar -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-tar -C ${OTA_SYSROOT} .
149 tar -cf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg.tar -C ${OTA_SYSROOT} .
150 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar
151 ln -s ${IMAGE_NAME}.otaimg.tar ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar
152 # To fit in with the rest of yocto's image utils, we create a rootfs.ota-tar in the deploy dir
153 cp ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ota-tar
154} 145}
155 146
156do_otasetup[doc] = "Sets up the base ota rootfs used for subsequent image generation" 147do_otasetup[doc] = "Sets up the base ota rootfs used for subsequent image generation"