summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Lees <gus@inodes.org>2019-03-21 16:46:05 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-26 10:09:08 +0100
commit97f7d3970235f3c1775f9101d2873370bcad22c3 (patch)
treeeccf1a666ec393e2b31ccd8e21608be43dec9ec3
parent6aac2bbe19f97431b12189dbc3ada7dd7be77c73 (diff)
downloadpoky-97f7d3970235f3c1775f9101d2873370bcad22c3.tar.gz
Revert "wic: Set a miniumum FAT16 volume size."
This reverts commit f7dfb4d43247d3c13a4e0a3853007d63b9512b83. FAT16 volumes do not have a minimum size of 8250 blocks (== slightly over 4MB). Exhibit A: floppy disks. The original commit message suggests this was a workaround for a bug in parted - in which case we should fix it there, or use the wic `--fixed-size` option to pass down an enforced minimum from a more context-aware point in the callstack. (From OE-Core rev: e0a1ae3863bc229512d43e4a5248551bf25950e5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/partition.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index ca206ece02..df31c17c40 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -322,7 +322,7 @@ class Partition():
322 322
323 dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \ 323 dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \
324 (label_str, self.fsuuid, size_str, extraopts, rootfs, 324 (label_str, self.fsuuid, size_str, extraopts, rootfs,
325 max(8250, rootfs_size)) 325 rootfs_size)
326 exec_native_cmd(dosfs_cmd, native_sysroot) 326 exec_native_cmd(dosfs_cmd, native_sysroot)
327 327
328 mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir) 328 mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)