From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Wed, 5 Jun 2024 07:00:32 +0000 (+0900)
Subject: scripts: sd_fusing: Fix wrong filesystem type about user
X-Git-Tag: accepted/tizen/unified/20241126.175211~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d6ca630f47ebc60d16a69c493b34dac55349083;p=platform%2Fkernel%2Fu-boot.git

scripts: sd_fusing: Fix wrong filesystem type about user

Tizen is using a user partition as f2fs filesystem.
It doesn't update the image because of mismatched filesystem type.

2024-06-05T15:52:37.819 Verifying that partition table on /dev/sdh matches target specification
2024-06-05T15:52:38.2 On-device partition mismatch with selected target: fstype=ext4, on-device:
DEVNAME=/dev/sdh5
UUID=c3237c35-3bee-45c0-80d6-599734b35701
TYPE=f2fs
PARTLABEL=user
PARTUUID=82d95111-8032-5c40-a80a-5138537eb66e

Change-Id: I801061da2176ee7ee125f95f0b808cddb181df17
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---

diff --git a/scripts/tizen/sd_fusing.py b/scripts/tizen/sd_fusing.py
index 46bb3e0cf3..8b63766d43 100755
--- a/scripts/tizen/sd_fusing.py
+++ b/scripts/tizen/sd_fusing.py
@@ -17,7 +17,7 @@ import tarfile
 import tempfile
 import time
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 Format = False
 Device = ""
@@ -275,7 +275,7 @@ class Rpi3(InitParams, SdFusingTarget):
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
         {"size": None, "ptype":  "5",    "name": "extended", "start": 4484},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "modules",
          "binaries": "modules.img"},
@@ -305,7 +305,7 @@ class Rpi4Super(InitParams, SdFusingTargetAB):
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
         {"size": 36,   "fstype": "raw",  "name": "none"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},
@@ -347,7 +347,7 @@ class Rpi4(InitParams, SdFusingTargetAB):
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
         {"size": 36,   "fstype": "raw",  "name": "none"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},
@@ -393,7 +393,7 @@ class Rpi4AoT(InitParams, SdFusingTargetAB):
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
         {"size": 36,   "fstype": "raw",  "name": "none"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},
@@ -453,7 +453,7 @@ class RV64(InitParams, SdFusingTarget):
          "binaries": "rootfs.img"},
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},
@@ -492,7 +492,7 @@ class VF2(InitParams, SdFusingTargetAB):
          "binaries": "rootfs.img"},
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},
@@ -545,7 +545,7 @@ class VF2Super(InitParams, SdFusingTargetAB):
          "binaries": "super.img"},
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},
@@ -590,7 +590,7 @@ class LicheePi4A(InitParams, SdFusingTargetAB):
          "binaries": "rootfs.img"},
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},
@@ -643,7 +643,7 @@ class LicheePi4ASuper(InitParams, SdFusingTargetAB):
          "binaries": "super.img"},
         {"size": 1344, "fstype": "ext4", "name": "system-data",
          "binaries": "system-data.img"},
-        {"size": None, "fstype": "ext4", "name": "user",
+        {"size": None, "fstype": "f2fs", "name": "user",
          "binaries": "user.img"},
         {"size": 32,   "fstype": "ext4", "name": "module_a",
          "binaries": "modules.img"},