From bf2775faa413f4544298e55ad4c0adcda4712e7d Mon Sep 17 00:00:00 2001
From: Christophe Priouzeau <christophe.priouzeau@st.com>
Date: Wed, 9 Oct 2019 11:29:50 +0200
Subject: [PATCH] SDCARD-RAW-TOOLS: handle GPT TYPE CODE and correct help
 display

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
---
 .../sdcard-raw-tools/sdcard-raw-tools.bb      |  7 ++++++-
 .../create_sdcard_from_flashlayout.sh         | 21 +++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools.bb b/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools.bb
index fe1e7a7..71c5018 100644
--- a/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools.bb
+++ b/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools.bb
@@ -1,7 +1,7 @@
 # Copyright (C) 2017, STMicroelectronics - All Rights Reserved
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-DESCRIPTION = "script for creating raw SDCARD image ready to flash"
+SUMMARY = "Script for creating raw SDCARD image ready to flash"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
@@ -9,6 +9,8 @@ SRC_URI = "file://create_sdcard_from_flashlayout.sh"
 
 BBCLASSEXTEND = "native nativesdk"
 
+RDEPENDS_${PN}_append = "bash"
+
 RRECOMMENDS_${PN}_append_class-nativesdk = "nativesdk-gptfdisk"
 
 inherit deploy
@@ -21,6 +23,9 @@ do_install() {
 }
 
 do_deploy() {
+    :
+}
+do_deploy_class-native() {
     install -d ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}
     install -m 0755 ${WORKDIR}/create_sdcard_from_flashlayout.sh ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}/
 }
diff --git a/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools/create_sdcard_from_flashlayout.sh b/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools/create_sdcard_from_flashlayout.sh
index aad5201..c446019 100755
--- a/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools/create_sdcard_from_flashlayout.sh
+++ b/recipes-devtools/sdcard-raw-tools/sdcard-raw-tools/create_sdcard_from_flashlayout.sh
@@ -650,19 +650,18 @@ function print_populate_on_infofile() {
 		then
 			if [ "$selected" == "P" ] || [ "$selected" == "E" ];
 			then
-				echo "- Populate partition $partName (/dev/mmcblk0p$j)" >> $FLASHLAYOUT_infoname
-				echo "    dd if=$bin2flash of=/dev/mmcblk0p$j bs=1M conv=fdatasync status=progress" >> $FLASHLAYOUT_infoname
-				echo "" >> $FLASHLAYOUT_infoname
-				j=$(($j+1))
-			fi
-			if [ "$selected" == "E" ];
-			then
-				echo "- Populate partition $partName (/dev/mmcblk0p$j)" >> $FLASHLAYOUT_infoname
-				if [ -n "$bin2flash" ];
+				if [ "$selected" == "E" ];
 				then
-					echo "    dd if=$bin2flash of=/dev/mmcblk0p$j bs=1M conv=fdatasync status=progress" >> $FLASHLAYOUT_infoname
+					echo "- Populate partition $partName (/dev/mmcblk0p$j)" >> $FLASHLAYOUT_infoname
+					if [ -n "$bin2flash" ];
+					then
+						echo "    dd if=$bin2flash of=/dev/mmcblk0p$j bs=1M conv=fdatasync status=progress" >> $FLASHLAYOUT_infoname
+					else
+						echo "    dd if=<raw image of $partName> of=/dev/mmcblk0p$j bs=1M conv=fdatasync status=progress" >> $FLASHLAYOUT_infoname
+					fi
 				else
-					echo "    dd if=<raw image of $partName> of=/dev/mmcblk0p$j bs=1M conv=fdatasync status=progress" >> $FLASHLAYOUT_infoname
+					echo "- Populate partition $partName (/dev/mmcblk0p$j)" >> $FLASHLAYOUT_infoname
+					echo "    dd if=$bin2flash of=/dev/mmcblk0p$j bs=1M conv=fdatasync status=progress" >> $FLASHLAYOUT_infoname
 				fi
 				echo "" >> $FLASHLAYOUT_infoname
 				j=$(($j+1))