MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wic: add 'none' fstype for custom image

Browse Source 
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>
This commit is contained in:
JeongBong Seo 2022-08-10 08:56:15 +00:00 committed by Richard Purdie
parent e5bd1a6b14
commit 0b85162b9c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/lib/wic/ksparser.py
View File

@ -159,7 +159,7 @@ class KickStart():
part.add_argument('--fstype', default='vfat', part.add_argument('--fstype', default='vfat',
choices=('ext2', 'ext3', 'ext4', 'btrfs', choices=('ext2', 'ext3', 'ext4', 'btrfs',
'squashfs', 'vfat', 'msdos', 'erofs', 'squashfs', 'vfat', 'msdos', 'erofs',
'swap')) 'swap', 'none'))
part.add_argument('--mkfs-extraopts', default='') part.add_argument('--mkfs-extraopts', default='')
part.add_argument('--label') part.add_argument('--label')
part.add_argument('--use-label', action='store_true') part.add_argument('--use-label', action='store_true')

4
scripts/lib/wic/plugins/source/rawcopy.py
View File

@ -25,6 +25,10 @@ class RawCopyPlugin(SourcePlugin):
@staticmethod @staticmethod
def do_image_label(fstype, dst, label): def do_image_label(fstype, dst, label):
# don't create label when fstype is none
if fstype == 'none':
return
if fstype.startswith('ext'): if fstype.startswith('ext'):
cmd = 'tune2fs -L %s %s' % (label, dst) cmd = 'tune2fs -L %s %s' % (label, dst)
elif fstype in ('msdos', 'vfat'): elif fstype in ('msdos', 'vfat'):