From 93631befe8b962bf99524746b49f4ebca336175c Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 12 Oct 2016 21:46:41 +0100 Subject: Remove RM_OLD_IMAGE, it's no longer useful Since the move to put image deployment under sstate control in d54339d4b1a7e884de636f6325ca60409ebd95ff old images are automatically removed before a new image is deployed (the default behaviour of the sstate logic). RM_OLD_IMAGE is therefore no longer required to provide this behaviour, remove the variable and its users. Signed-off-by: Joshua Lock Signed-off-by: Ross Burton --- meta/classes/image-vm.bbclass | 8 -------- 1 file changed, 8 deletions(-) (limited to 'meta/classes/image-vm.bbclass') diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 32c6550037..2f35d6b4d1 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass @@ -106,10 +106,6 @@ build_boot_dd() { cd ${IMGDEPLOYDIR} - if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ]; then - rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect) - fi - ln -sf ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect } @@ -147,10 +143,6 @@ run_qemu_img (){ type="$1" qemu-img convert -O $type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type - if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type ]; then - rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type) - fi - ln -sf ${IMAGE_NAME}.$type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type } create_vmdk_image () { -- cgit 1.2.3-korg