SDCARD-RAW-TOOLS: handle GPT TYPE CODE and correct help display

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
This commit is contained in:
Christophe Priouzeau 2019-10-09 11:29:50 +02:00
parent faff1bdb5d
commit bf2775faa4
2 changed files with 16 additions and 12 deletions

View File

@ -1,7 +1,7 @@
# Copyright (C) 2017, STMicroelectronics - All Rights Reserved # Copyright (C) 2017, STMicroelectronics - All Rights Reserved
# Released under the MIT license (see COPYING.MIT for the terms) # 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" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 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" BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN}_append = "bash"
RRECOMMENDS_${PN}_append_class-nativesdk = "nativesdk-gptfdisk" RRECOMMENDS_${PN}_append_class-nativesdk = "nativesdk-gptfdisk"
inherit deploy inherit deploy
@ -21,6 +23,9 @@ do_install() {
} }
do_deploy() { do_deploy() {
:
}
do_deploy_class-native() {
install -d ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR} install -d ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}
install -m 0755 ${WORKDIR}/create_sdcard_from_flashlayout.sh ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}/ install -m 0755 ${WORKDIR}/create_sdcard_from_flashlayout.sh ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}/
} }

View File

@ -650,19 +650,18 @@ function print_populate_on_infofile() {
then then
if [ "$selected" == "P" ] || [ "$selected" == "E" ]; if [ "$selected" == "P" ] || [ "$selected" == "E" ];
then then
echo "- Populate partition $partName (/dev/mmcblk0p$j)" >> $FLASHLAYOUT_infoname if [ "$selected" == "E" ];
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" ];
then 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 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 fi
echo "" >> $FLASHLAYOUT_infoname echo "" >> $FLASHLAYOUT_infoname
j=$(($j+1)) j=$(($j+1))