diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-10-12 21:46:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-15 10:01:42 +0100 |
commit | 751cb2c894122807ed62341ae6b5f129a65e399b (patch) | |
tree | 06a336087a9fba0d14c599d89578b85e347b8660 /meta/classes/image-vm.bbclass | |
parent | 1a95d4a0701b87ae3674239a01aabe38a0123585 (diff) | |
download | poky-751cb2c894122807ed62341ae6b5f129a65e399b.tar.gz |
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.
(From OE-Core rev: 93631befe8b962bf99524746b49f4ebca336175c)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image-vm.bbclass')
-rw-r--r-- | meta/classes/image-vm.bbclass | 8 |
1 files changed, 0 insertions, 8 deletions
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() { | |||
106 | 106 | ||
107 | cd ${IMGDEPLOYDIR} | 107 | cd ${IMGDEPLOYDIR} |
108 | 108 | ||
109 | if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ]; then | ||
110 | rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect) | ||
111 | fi | ||
112 | |||
113 | ln -sf ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect | 109 | ln -sf ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect |
114 | } | 110 | } |
115 | 111 | ||
@@ -147,10 +143,6 @@ run_qemu_img (){ | |||
147 | type="$1" | 143 | type="$1" |
148 | qemu-img convert -O $type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type | 144 | qemu-img convert -O $type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type |
149 | 145 | ||
150 | if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type ]; then | ||
151 | rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type) | ||
152 | fi | ||
153 | |||
154 | ln -sf ${IMAGE_NAME}.$type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type | 146 | ln -sf ${IMAGE_NAME}.$type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type |
155 | } | 147 | } |
156 | create_vmdk_image () { | 148 | create_vmdk_image () { |