On Wed, 2014-03-12 at 14:54 -0500, Tom Zanussi wrote: > On Mon, 2014-03-10 at 22:06 -0700, Richard Purdie wrote: > > On Mon, 2014-03-10 at 19:05 -0500, Tom Zanussi wrote: > > > 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 <[email protected]> > > > > > --- > > > > > 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? > > > > I hadn't realised that the exec_native_cmd took care of resolving the > > prefix for you. The populate_script had a prefix because its used with > > pseudo (I'd thought it was so it found the right command). > > > > That does raise another question though, how does this work now pseudo > > isn't used? > > > > Good point, it did miss pseudo. Here's a fix to the fix: > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/wic-ext2fs-fix-fix > > > > [PATCH] wic: Use pseudo for ext mkfs command > > The switchover from populate-exfs.sh to mke2fs forgot to preserve > pseudo, add it back. > > Signed-off-by: Tom Zanussi <[email protected]> > --- > scripts/lib/mic/kickstart/custom_commands/partition.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py > b/scripts/lib/mic/kickstart/custom_commands/partition.py > index e0a82f5..e15150b 100644 > --- a/scripts/lib/mic/kickstart/custom_commands/partition.py > +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py > @@ -200,7 +200,7 @@ class Wic_PartData(Mic_PartData): > > 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) > + rc, out = exec_native_cmd(pseudo + mkfs_cmd, native_sysroot)
In the original version the full path to mkfs.X was specified, in this version PATH will be used to find it. Will it find the right version? Cheers, Richard -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
