[PATCH v2 09/17] meta/image: Fix broken variables KERNEL_IMAGE and INITRD_IMAGE

[Henning Schild <henning.schild@siemens.com>]

Commit 5d15bb11f30c6f581c6 renamed the kernel in initrd in the deploy
folder. While that is correct only one user of those variables was
updated. So wic will still look for a file called exactly what the
variables say.

This commit goes back to the original way, where the variables contain
actual filenames while maintaining the file renaming pattern.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/image.bbclass | 20 ++++++++++++--------
 scripts/start_vm           |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2243860..bb2c1e3 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -12,11 +12,15 @@ def get_image_name(d, name_link):
     S = d.getVar("IMAGE_ROOTFS", True)
     path_link = os.path.join(S, name_link)
     if os.path.exists(path_link):
-        return os.path.basename(os.path.realpath(path_link))
+        base = os.path.basename(os.path.realpath(path_link))
+        full = base
+        full += "_" + d.getVar("DISTRO", True)
+        full += "-" + d.getVar("MACHINE", True)
+        return [base, full]
     if os.path.islink(path_link):
         return get_image_name(d, os.path.relpath(os.path.realpath(path_link),
                                                  '/'))
-    return ""
+    return ["", ""]
 
 def get_rootfs_size(d):
     import subprocess
@@ -35,8 +39,8 @@ python set_image_size () {
 }
 
 # These variables are used by wic and start_vm
-KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')}"
-INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')}"
+KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}"
+INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}"
 
 inherit ${IMAGE_TYPE}
 
@@ -51,14 +55,14 @@ addtask rootfs before do_build after do_unpack
 do_rootfs[deptask] = "do_deploy_deb"
 
 do_copy_boot_files() {
-    KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')}
+    KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')[1]}
     if [ -n "${KERNEL_IMAGE}" ]; then
-        cp -f ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}_${DISTRO}-${MACHINE}
+        cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}
     fi
 
-    INITRD_IMAGE=${@get_image_name(d, 'initrd.img')}
+    INITRD_IMAGE=${@get_image_name(d, 'initrd.img')[1]}
     if [ -n "${INITRD_IMAGE}" ]; then
-        sudo cp -f ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}_${DISTRO}-${MACHINE}
+        sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'initrd.img')[0]} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}
     fi
 }
 
diff --git a/scripts/start_vm b/scripts/start_vm
index 26274be..6c89ce9 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -108,9 +108,9 @@ readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img
 
 eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=")
 eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=")
-QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}_debian-$DISTRO-qemu$ARCH
+QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}
 QINITRD=/dev/null
-[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}_debian-$DISTRO-qemu$ARCH
+[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}
 
 readonly ISARROOT="$(dirname "$0")"/..
 
-- 
2.16.1