[PATCH v2 4/5] image: Name image canonicaly and unified

[Alexander Smirnov <asmirnov@ilbers.de>]

Name images according to the build folders structure:
${DISTRO}-${MACHINE}.

Now all the build artifacts have the same unified names.

Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
---
 meta/classes/ext4-img.bbclass | 2 +-
 scripts/start_vm              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass
index 9af781f..3e3768b 100644
--- a/meta/classes/ext4-img.bbclass
+++ b/meta/classes/ext4-img.bbclass
@@ -4,7 +4,7 @@
 # Extra space for rootfs in MB
 ROOTFS_EXTRA ?= "64"
 
-EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${MACHINE}-${DISTRO}.ext4.img"
+EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.ext4.img"
 
 do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
 
diff --git a/scripts/start_vm b/scripts/start_vm
index 32d4864..1ce84b7 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -109,7 +109,7 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF |bb2sh)"
 
 readonly CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf
 eval "$(egrep '(KERNEL|INITRD)_IMAGE|ROOTFS_DEV|QEMU_' $CONFIG_CONF |bb2sh)"
-readonly ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO.ext4.img
+readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img
 
 QCPU=
 [ -n "$QEMU_CPU" ] && QCPU="-cpu $QEMU_CPU"
-- 
2.1.4