From 3fcee22ee87b0561aa53eb438c88b91eb493e7ec Mon Sep 17 00:00:00 2001
From: Jussi Laako <jussi.laako@linux.intel.com>
Date: Thu, 21 Apr 2016 12:07:00 +0300
Subject: [PATCH] meta-ostro-bsp: Use correct image name on Windows
 flashall.bat

The Windows flashall.bat was unmaintained and had old image name. Modify
the flashall.bat to accept image name as argument and also modify the
flashall.bat when producing toflash-tarball.

Fixes: ostro-os issue #62

(From meta-ostro-bsp rev: c82e5144ab9d98cdb2b442345a11444fd2370484)

Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>
---
 .../classes/image_types_edison.bbclass               |  1 +
 .../recipes-bsp/flashall/flashall-2.0/flashall.bat   | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta-ostro-bsp/meta-edison-bsp/classes/image_types_edison.bbclass b/meta-ostro-bsp/meta-edison-bsp/classes/image_types_edison.bbclass
index 1cfb05ad5c1..3ae7cacbd8a 100644
--- a/meta-ostro-bsp/meta-edison-bsp/classes/image_types_edison.bbclass
+++ b/meta-ostro-bsp/meta-edison-bsp/classes/image_types_edison.bbclass
@@ -107,6 +107,7 @@ IMAGE_CMD_toflash () {
 
 	# update image name inside flashall.sh
 	sed -e "s/^IMAGE_NAME=.\+$/IMAGE_NAME=\"${IMAGE_BASENAME}\"/" -i ${WORKDIR}/toFlash/flashall.sh
+	sed -e "s/^set IMAGE_NAME=.\+$/set IMAGE_NAME=${IMAGE_BASENAME}/" -i ${WORKDIR}/toFlash/flashall.bat
 
 	# generate a formatted list of all packages included in the image
 	awk '{print $1 " " $3}' ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest > ${WORKDIR}/toFlash/package-list.txt
diff --git a/meta-ostro-bsp/meta-edison-bsp/recipes-bsp/flashall/flashall-2.0/flashall.bat b/meta-ostro-bsp/meta-edison-bsp/recipes-bsp/flashall/flashall-2.0/flashall.bat
index 417cbc8df51..5bd369ea3ed 100644
--- a/meta-ostro-bsp/meta-edison-bsp/recipes-bsp/flashall/flashall-2.0/flashall.bat
+++ b/meta-ostro-bsp/meta-edison-bsp/recipes-bsp/flashall/flashall-2.0/flashall.bat
@@ -18,6 +18,8 @@ set VARIANT_NAME_DEFAULT=edison-defaultrndis
 set VARIANT_NAME_BLANK=edison-blankrndis
 set VARIANT_NAME=%VARIANT_NAME_BLANK%
 
+set IMAGE_NAME=
+
 set LOG_FILENAME=flash.log
 set /a verbose_output=0
 :: ********************************************************************
@@ -37,11 +39,14 @@ if -%1- == -/?- set /a show_help=1
 if -%1- == --h- set /a show_help=1
 if -%1- == ---help- set /a show_help=1
 if -%1- == --v- set /a verbose_output=1
+if -%1- == --i- set IMAGE_NAME=%2
 set /a argcount+= 1
 shift
 goto :parse_arg_start
 :parse_arg_end
 
+if -%IMAGE_NAME%-==-- set show_help=1
+
 :: handle help on cmd arg
 if %show_help% == 1 (
 	call:print-usage %appname%
@@ -136,15 +141,15 @@ if %errorlevel% neq 0 ( exit /b %errorlevel%)
 
 
 echo Flashing boot partition ^(kernel^)
-call:flash-command --alt boot -D "%BASE_DIR%edison-image-edison.hddimg"
+call:flash-command --alt boot -D "%BASE_DIR%\%IMAGE_NAME%-edison.hddimg"
 if %errorlevel% neq 0 ( exit /b %errorlevel%)
 
 echo Flashing update partition
-call:flash-command --alt update -D "%BASE_DIR%edison-image-edison.update.hddimg"
+call:flash-command --alt update -D "%BASE_DIR%\%IMAGE_NAME%-edison.update.hddimg"
 if %errorlevel% neq 0 ( exit /b %errorlevel%)
 
 echo Flashing rootfs, ^(it can take up to 5 minutes... Please be patient^)
-call:flash-command --alt rootfs -D "%BASE_DIR%edison-image-edison.ext4" -R
+call:flash-command --alt rootfs -D "%BASE_DIR%\%IMAGE_NAME%-edison.ext4" -R
 if %errorlevel% neq 0 ( exit /b %errorlevel% )
 
 echo Rebooting
@@ -167,6 +172,7 @@ exit /b 0
 	echo  --recovery    recover the board to DFU mode using a dedicated tool,
 	echo                available only on linux and window hosts.
 	echo  --keep-data   preserve user data when flashing.
+	echo  -i imagename  flash image with image name "imagename"
 	exit /b 5
 
 :flash-dfu-ifwi