summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-03-30 17:08:23 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-01 08:14:57 +0100
commit88e1d55de2612f27d4c043181c37e710b33ecaec (patch)
treef0319ee15640e97f12d076ed4e91cbf1d96ecf9c /scripts
parentb4d15e071399dbadf2a9334cc5d49f0a406ac160 (diff)
downloadpoky-88e1d55de2612f27d4c043181c37e710b33ecaec.tar.gz
wic: support 'msdos' fstype
Added prepare_empty_partition_msdos and prepare_rootfs_msdos methods to support 'msdos' filesystem type. Created aliases prepare_empty_partition_vfat and prepare_rootfs_vfat to continue supporting creation of vfat patitiions. (From OE-Core rev: f06c507078da72f616f45effe5005cc01615a17c) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/partition.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 28ad3e6473..d59351c500 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -290,10 +290,10 @@ class Partition():
290 (self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs) 290 (self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs)
291 exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) 291 exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo)
292 292
293 def prepare_rootfs_vfat(self, rootfs, oe_builddir, rootfs_dir, 293 def prepare_rootfs_msdos(self, rootfs, oe_builddir, rootfs_dir,
294 native_sysroot, pseudo): 294 native_sysroot, pseudo):
295 """ 295 """
296 Prepare content for a vfat rootfs partition. 296 Prepare content for a msdos/vfat rootfs partition.
297 """ 297 """
298 du_cmd = "du -bks %s" % rootfs_dir 298 du_cmd = "du -bks %s" % rootfs_dir
299 out = exec_cmd(du_cmd) 299 out = exec_cmd(du_cmd)
@@ -314,6 +314,8 @@ class Partition():
314 chmod_cmd = "chmod 644 %s" % rootfs 314 chmod_cmd = "chmod 644 %s" % rootfs
315 exec_cmd(chmod_cmd) 315 exec_cmd(chmod_cmd)
316 316
317 prepare_rootfs_vfat = prepare_rootfs_msdos
318
317 def prepare_rootfs_squashfs(self, rootfs, oe_builddir, rootfs_dir, 319 def prepare_rootfs_squashfs(self, rootfs, oe_builddir, rootfs_dir,
318 native_sysroot, pseudo): 320 native_sysroot, pseudo):
319 """ 321 """
@@ -359,8 +361,8 @@ class Partition():
359 (self.fstype, self.size * 1024, label_str, rootfs) 361 (self.fstype, self.size * 1024, label_str, rootfs)
360 exec_native_cmd(mkfs_cmd, native_sysroot) 362 exec_native_cmd(mkfs_cmd, native_sysroot)
361 363
362 def prepare_empty_partition_vfat(self, rootfs, oe_builddir, 364 def prepare_empty_partition_msdos(self, rootfs, oe_builddir,
363 native_sysroot): 365 native_sysroot):
364 """ 366 """
365 Prepare an empty vfat partition. 367 Prepare an empty vfat partition.
366 """ 368 """
@@ -376,6 +378,8 @@ class Partition():
376 chmod_cmd = "chmod 644 %s" % rootfs 378 chmod_cmd = "chmod 644 %s" % rootfs
377 exec_cmd(chmod_cmd) 379 exec_cmd(chmod_cmd)
378 380
381 prepare_empty_partition_vfat = prepare_empty_partition_msdos
382
379 def prepare_empty_partition_squashfs(self, cr_workdir, oe_builddir, 383 def prepare_empty_partition_squashfs(self, cr_workdir, oe_builddir,
380 native_sysroot): 384 native_sysroot):
381 """ 385 """