From 0d2d9f8c2929e36460f49bae09e4d81ba38bd70c Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Wed, 1 May 2019 16:27:04 +0000
Subject: [PATCH] scripts/image: use BUILD_NAME in mkimage

---
 scripts/image    |  1 +
 scripts/image_st |  1 +
 scripts/mkimage  | 12 ++++++------
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/image b/scripts/image
index 0b509efbf9..18ea65c562 100755
--- a/scripts/image
+++ b/scripts/image
@@ -32,6 +32,7 @@ function do_mkimage() {
     DEVICE="$DEVICE" \
     DISTRO="$DISTRO" \
     TARGET_IMG="$TARGET_IMG" \
+    BUILD_NAME="$IMAGE_NAME" \
     IMAGE_NAME="$IMAGE_NAME" \
     INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
     BOOTLOADER="$BOOTLOADER" \
diff --git a/scripts/image_st b/scripts/image_st
index 4a0bebc988..9bc86fa98d 100755
--- a/scripts/image_st
+++ b/scripts/image_st
@@ -35,6 +35,7 @@ function do_mkimage() {
     DEVICE="$DEVICE" \
     DISTRO="$DISTRO" \
     TARGET_IMG="$TARGET_IMG" \
+    BUILD_NAME="$IMAGE_NAME" \
     IMAGE_NAME="$IMAGE_NAME" \
     INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
     BOOTLOADER="$BOOTLOADER" \
diff --git a/scripts/mkimage b/scripts/mkimage
index bd1410ec16..6e9ef996ce 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -158,8 +158,8 @@ EOF
 
   # copy files
   echo "image: copying files to part1..."
-  mcopy "${TARGET_IMG}/${IMAGE_NAME}.kernel" "::/${KERNEL_NAME}"
-  mcopy "${TARGET_IMG}/${IMAGE_NAME}.system" ::/SYSTEM
+  mcopy "${TARGET_IMG}/${BUILD_NAME}.kernel" "::/${KERNEL_NAME}"
+  mcopy "${TARGET_IMG}/${BUILD_NAME}.system" ::/SYSTEM
   mcopy "${RELEASE_DIR}/target/KERNEL.md5" "::/${KERNEL_NAME}.md5"
   mcopy "${RELEASE_DIR}/target/SYSTEM.md5" ::/SYSTEM.md5
 
@@ -180,8 +180,8 @@ EOF
 
   # copy files
   echo "image: copying files to part1..."
-  mcopy "${TARGET_IMG}/${IMAGE_NAME}.kernel" "::/${KERNEL_NAME}"
-  mcopy "${TARGET_IMG}/${IMAGE_NAME}.system" ::/SYSTEM
+  mcopy "${TARGET_IMG}/${BUILD_NAME}.kernel" "::/${KERNEL_NAME}"
+  mcopy "${TARGET_IMG}/${BUILD_NAME}.system" ::/SYSTEM
   mcopy "${RELEASE_DIR}/target/KERNEL.md5" "::/${KERNEL_NAME}.md5"
   mcopy "${RELEASE_DIR}/target/SYSTEM.md5" ::/SYSTEM.md5
 
@@ -237,8 +237,8 @@ EOF
   fi
 
   echo "image: copying files to part1..."
-  mcopy "${TARGET_IMG}/${IMAGE_NAME}.kernel" "::/${KERNEL_NAME}"
-  mcopy "${TARGET_IMG}/${IMAGE_NAME}.system" ::/SYSTEM
+  mcopy "${TARGET_IMG}/${BUILD_NAME}.kernel" "::/${KERNEL_NAME}"
+  mcopy "${TARGET_IMG}/${BUILD_NAME}.system" ::/SYSTEM
   mcopy "${RELEASE_DIR}/target/KERNEL.md5" "::/${KERNEL_NAME}.md5"
   mcopy "${RELEASE_DIR}/target/SYSTEM.md5" ::/SYSTEM.md5