summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorJeongBong Seo <lifeofthanks@gmail.com>2022-08-10 08:56:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-12 19:22:04 +0100
commit0b85162b9c22f3d2783b7f39ab8357e6bcd1ad54 (patch)
tree5328e94e7b7bda899d69c28b6c089772c2970b3c /scripts/lib
parente5bd1a6b14d8c88804876cc8b3af8c61300a8a12 (diff)
downloadpoky-0b85162b9c22f3d2783b7f39ab8357e6bcd1ad54.tar.gz
wic: add 'none' fstype for custom image
It's not possible to set the label (of gpt entry) normally when I want to use non-listed fstype as a rawcopy. Example) part ? --source rawcopy --ondisk mmcblk0 --label mypart --sourceparams file=mypart.raw To resolve this problem, this patch addes a 'none' fstype and ignore do_image_label on rawcopy (that actually set the partition label.) (From OE-Core rev: 949cf797eb54f3d22a093910087e937633ce9b23) Signed-off-by: JeongBong Seo <jb.seo@lge.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/ksparser.py2
-rw-r--r--scripts/lib/wic/plugins/source/rawcopy.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index a49b7b97c4..d1e546b12d 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -159,7 +159,7 @@ class KickStart():
159 part.add_argument('--fstype', default='vfat', 159 part.add_argument('--fstype', default='vfat',
160 choices=('ext2', 'ext3', 'ext4', 'btrfs', 160 choices=('ext2', 'ext3', 'ext4', 'btrfs',
161 'squashfs', 'vfat', 'msdos', 'erofs', 161 'squashfs', 'vfat', 'msdos', 'erofs',
162 'swap')) 162 'swap', 'none'))
163 part.add_argument('--mkfs-extraopts', default='') 163 part.add_argument('--mkfs-extraopts', default='')
164 part.add_argument('--label') 164 part.add_argument('--label')
165 part.add_argument('--use-label', action='store_true') 165 part.add_argument('--use-label', action='store_true')
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index 8101efcb28..ccf332554e 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -25,6 +25,10 @@ class RawCopyPlugin(SourcePlugin):
25 25
26 @staticmethod 26 @staticmethod
27 def do_image_label(fstype, dst, label): 27 def do_image_label(fstype, dst, label):
28 # don't create label when fstype is none
29 if fstype == 'none':
30 return
31
28 if fstype.startswith('ext'): 32 if fstype.startswith('ext'):
29 cmd = 'tune2fs -L %s %s' % (label, dst) 33 cmd = 'tune2fs -L %s %s' % (label, dst)
30 elif fstype in ('msdos', 'vfat'): 34 elif fstype in ('msdos', 'vfat'):