Re: [OE-core] [PATCH] wic: add 'none' fstype for custom image

[Alexandre Belloni <alexandre.belloni@bootlin.com>]

Hello,

On 08/08/2022 04:57:10+0000, JeongBong Seo wrote:
> 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.)
> 
> Signed-off-by: JeongBong Seo <jb.seo@lge.com>
> ---
>  scripts/lib/wic/ksparser.py               | 2 +-
>  scripts/lib/wic/plugins/source/rawcopy.py | 4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
> index 452a160232..298e593ad4 100644
> --- a/scripts/lib/wic/ksparser.py
> +++ b/scripts/lib/wic/ksparser.py
> @@ -157,7 +157,7 @@ class KickStart():
>          part.add_argument('--fsoptions', dest='fsopts')
>          part.add_argument('--fstype', default='vfat',
>                            choices=('ext2', 'ext3', 'ext4', 'btrfs',
> -                                   'squashfs', 'vfat', 'msdos', 'swap'))
> +                                   'squashfs', 'vfat', 'msdos', 'swap', 'none'))

This doesn't apply on master, can you rebase please?

>          part.add_argument('--mkfs-extraopts', default='')
>          part.add_argument('--label')
>          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 3c4997d8ba..a71629282d 100644
> --- a/scripts/lib/wic/plugins/source/rawcopy.py
> +++ b/scripts/lib/wic/plugins/source/rawcopy.py
> @@ -21,6 +21,10 @@ class RawCopyPlugin(SourcePlugin):
>  
>      @staticmethod
>      def do_image_label(fstype, dst, label):
> +        # don't create label when fstype is none
> +        if fstype == 'none':
> +            return
> +
>          if fstype.startswith('ext'):
>              cmd = 'tune2fs -L %s %s' % (label, dst)
>          elif fstype in ('msdos', 'vfat'):
> -- 
> 2.17.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#169013): https://lists.openembedded.org/g/openembedded-core/message/169013
> Mute This Topic: https://lists.openembedded.org/mt/92886214/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com