From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Tue, 9 Jun 2020 03:42:07 +0000 (+0900)
Subject: tizen: sd_fusing_xu4.sh: Support for non-sdX partition names
X-Git-Tag: submit/tizen/20200610.021850~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff1e0f869d3755b0cae28af6d6a0ef558e0b36af;p=platform%2Fkernel%2Fu-boot.git

tizen: sd_fusing_xu4.sh: Support for non-sdX partition names

Properly find partiton device names for the given block device. In
case of MMC (or loop) partition names are created in a different way
(/dev/mmcblk0p1) than for typical USB pen-drives (/dev/sdb1).

Change-Id: Ic486e97a4e04c25dc438315bcefa668945765e65
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
---

diff --git a/scripts/tizen/sd_fusing_xu4.sh b/scripts/tizen/sd_fusing_xu4.sh
index 0a7fbe0e99..b90f6e59ec 100755
--- a/scripts/tizen/sd_fusing_xu4.sh
+++ b/scripts/tizen/sd_fusing_xu4.sh
@@ -124,7 +124,8 @@ function fusing_image () {
 	local -r -i part_idx=$?
 
 	if [ $part_idx -ne $PART_TABLE_ROW ];then
-		local -r device=$DEVICE${PART_TABLE[${part_idx} * ${PART_TABLE_COL} + 1]}
+		local -r num=${PART_TABLE[${part_idx} * ${PART_TABLE_COL} + 1]}
+		local -r device=/dev/`lsblk ${DEVICE} -o KNAME | grep -G "[a-z]${num}\$"`
 		local -r seek=${PART_TABLE[${part_idx} * ${PART_TABLE_COL} + 2]}
 		local -r bs=${PART_TABLE[${part_idx} * ${PART_TABLE_COL} + 3]}
 	else
@@ -299,12 +300,23 @@ function mkpart_3 () {
 		__EOF__
 	fi
 
-	mkfs.vfat -F 16 ${DISK}1 -n $BOOT
-	mkfs.ext4 -q ${DISK}2 -L $ROOTFS -F
-	mkfs.ext4 -q ${DISK}3 -L $SYSTEMDATA -F
-	mkfs.ext4 -q ${DISK}5 -L $USER -F
-	mkfs.ext4 -q ${DISK}6 -L $MODULE -F
-	mkfs.ext4 -q ${DISK}7 -L $RAMDISK -F
+	local -r PART1=/dev/`lsblk ${DISK} -o KNAME | grep -G "[a-z]1\$"`
+	mkfs.vfat -F 16 ${PART1} -n $BOOT
+
+	local -r PART2=/dev/`lsblk ${DISK} -o KNAME | grep -G "[a-z]2\$"`
+	mkfs.ext4 -q ${PART2} -L $ROOTFS -F
+
+	local -r PART3=/dev/`lsblk ${DISK} -o KNAME | grep -G "[a-z]3\$"`
+	mkfs.ext4 -q ${PART3} -L $SYSTEMDATA -F
+
+	local -r PART5=/dev/`lsblk ${DISK} -o KNAME | grep -G "[a-z]5\$"`
+	mkfs.ext4 -q ${PART5} -L $USER -F
+
+	local -r PART6=/dev/`lsblk ${DISK} -o KNAME | grep -G "[a-z]6\$"`
+	mkfs.ext4 -q ${PART6} -L $MODULE -F
+
+	local -r PART7=/dev/`lsblk ${DISK} -o KNAME | grep -G "[a-z]7\$"`
+	mkfs.ext4 -q ${PART7} -L $RAMDISK -F
 }
 
 function show_usage () {
@@ -388,7 +400,7 @@ function check_device () {
 
 function print_logo () {
 	echo ""
-	echo "[Odroid-XU3/4 downloader version 1.3.1]"
+	echo "[Odroid-XU3/4 downloader version 1.4.0]"
 	echo "This version also supports Tizen 4.0."
 	echo ""
 }