summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-03-08 22:23:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-12 15:06:15 -0700
commit4dea928eef325364922b1e0cbabc2a581356e804 (patch)
tree78f4463616d191d186cd6a4fa4b2541f83a0e3e8 /scripts
parentf5b16a1879351eac015a541150dec547f971bb31 (diff)
downloadopenembedded-core-4dea928eef325364922b1e0cbabc2a581356e804.tar.gz
openembedded-core-4dea928eef325364922b1e0cbabc2a581356e804.tar.bz2
openembedded-core-4dea928eef325364922b1e0cbabc2a581356e804.zip
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 <joaohf@gmail.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/mic/kickstart/custom_commands/partition.py6
1 files 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 91d751eb16..e0a82f58f6 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