From: João Henrique Ferreira de Freitas Date: Sat, 8 Mar 2014 22:23:57 +0000 (+0000) Subject: wic: Use mke2fs to create the ext2/3/4 image X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dea928eef325364922b1e0cbabc2a581356e804;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git wic: Use mke2fs to create the ext2/3/4 image 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 Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py index 91d751eb164..e0a82f58f65 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