[OE-core] [PATCH] wic: Use mke2fs to create the ext2/3/4 image

[Tom Zanussi]

On Sun, 2014-03-09 at 18:04 -0700, Richard Purdie wrote:
> On Sat, 2014-03-08 at 19:23 -0300, João Henrique Ferreira de Freitas
> wrote:
> > OE-core commit f3a95ca6886b55e5819b068bdbd2cceb882d91a6 removed the
> > populate-extfs.sh. So mke2fs should be used to create ext2/3/4 image.
> > 
> > Signed-off-by: João Henrique Ferreira de Freitas <joaohf at gmail.com>
> > ---
> >  scripts/lib/mic/kickstart/custom_commands/partition.py | 6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> > 
> > diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py
> > index 91d751e..e0a82f5 100644
> > --- a/scripts/lib/mic/kickstart/custom_commands/partition.py
> > +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py
> > @@ -174,7 +174,6 @@ class Wic_PartData(Mic_PartData):
> >          """
> >          Prepare content for an ext2/3/4 rootfs partition.
> >          """
> > -        populate_script = "%s/usr/bin/populate-extfs.sh" % native_sysroot
> >  
> >          image_rootfs = rootfs_dir
> >          rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype)
> > @@ -199,11 +198,10 @@ class Wic_PartData(Mic_PartData):
> >  
> >          extra_imagecmd = "-i 8192"
> >  
> > -        mkfs_cmd = "mkfs.%s -F %s %s" % (self.fstype, extra_imagecmd, rootfs)
> > +        mkfs_cmd = "mkfs.%s -F %s %s -d %s" % \
> > +            (self.fstype, extra_imagecmd, rootfs, image_rootfs)
> >          rc, out = exec_native_cmd(mkfs_cmd, native_sysroot)
> >  
> > -        populate_cmd = populate_script + " " + image_rootfs + " " + rootfs
> > -        rc, out = exec_native_cmd(pseudo + populate_cmd, native_sysroot)
> >  
> >          # get the rootfs size in the right units for kickstart (Mb)
> >          du_cmd = "du -Lbms %s" % rootfs
> 
> Don't we need to be careful to find the binary from the native sysroot
> here since that is the one with the root directory option?
> 

Hmm, exec_native_cmd(mkfs_cmd, native_sysroot) is being used to do the
'mke2fs -d', which should do the right thing... Am I missing something?

Tom


> Cheers,
> 
> Richard
>