summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-06-02 13:49:33 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 13:13:30 +0100
commit469e56b1a7c8da38cb4c572c5609c86b8c9768dd (patch)
treea9d0679ea912541b89a24e4f308496d0a4405f07 /scripts/lib
parent48bc62378a3705730f376ca03c2d6efe7a98d924 (diff)
downloadpoky-469e56b1a7c8da38cb4c572c5609c86b8c9768dd.tar.gz
image-live, image-vm, wic: Remove fs size workaround
Since mtools has been patched to live with filesystems with sizes not divisible by sectors-per-track, we no longer need to try to set the size based on our guess of the sectors-per-track dosfstools is going to use. (From OE-Core rev: 334e32af88b310ff1ed950d127a6dedeb460f8d0) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/partition.py8
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py6
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py6
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py6
4 files changed, 0 insertions, 26 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 34fd7d6a72..30cd320a30 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -281,14 +281,6 @@ class Partition():
281 msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \ 281 msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
282 (extra_blocks, self.mountpoint, blocks)) 282 (extra_blocks, self.mountpoint, blocks))
283 283
284 # Ensure total sectors is an integral number of sectors per
285 # track or mcopy will complain. Sectors are 512 bytes, and we
286 # generate images with 32 sectors per track. This calculation
287 # is done in blocks, thus the mod by 16 instead of 32. Apply
288 # sector count fix only when needed.
289 if blocks % 16 != 0:
290 blocks += (16 - (blocks % 16))
291
292 label_str = "-n boot" 284 label_str = "-n boot"
293 if self.label: 285 if self.label:
294 label_str = "-n %s" % self.label 286 label_str = "-n %s" % self.label
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index ec13f6d2e5..3a16861204 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -216,12 +216,6 @@ class BootimgEFIPlugin(SourcePlugin):
216 msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \ 216 msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
217 (extra_blocks, part.mountpoint, blocks)) 217 (extra_blocks, part.mountpoint, blocks))
218 218
219 # Ensure total sectors is an integral number of sectors per
220 # track or mcopy will complain. Sectors are 512 bytes, and we
221 # generate images with 32 sectors per track. This calculation is
222 # done in blocks, thus the mod by 16 instead of 32.
223 blocks += (16 - (blocks % 16))
224
225 # dosfs image, created by mkdosfs 219 # dosfs image, created by mkdosfs
226 bootimg = "%s/boot.img" % cr_workdir 220 bootimg = "%s/boot.img" % cr_workdir
227 221
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 5b719bf3bb..f204daa323 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -179,12 +179,6 @@ class BootimgPcbiosPlugin(SourcePlugin):
179 msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \ 179 msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
180 (extra_blocks, part.mountpoint, blocks)) 180 (extra_blocks, part.mountpoint, blocks))
181 181
182 # Ensure total sectors is an integral number of sectors per
183 # track or mcopy will complain. Sectors are 512 bytes, and we
184 # generate images with 32 sectors per track. This calculation is
185 # done in blocks, thus the mod by 16 instead of 32.
186 blocks += (16 - (blocks % 16))
187
188 # dosfs image, created by mkdosfs 182 # dosfs image, created by mkdosfs
189 bootimg = "%s/boot.img" % cr_workdir 183 bootimg = "%s/boot.img" % cr_workdir
190 184
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index ed59d85962..3858fd439b 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -441,12 +441,6 @@ class IsoImagePlugin(SourcePlugin):
441 % (part.mountpoint, blocks) 441 % (part.mountpoint, blocks)
442 msger.debug(msg) 442 msger.debug(msg)
443 443
444 # Ensure total sectors is an integral number of sectors per
445 # track or mcopy will complain. Sectors are 512 bytes, and we
446 # generate images with 32 sectors per track. This calculation is
447 # done in blocks, thus the mod by 16 instead of 32.
448 blocks += (16 - (blocks % 16))
449
450 # dosfs image for EFI boot 444 # dosfs image for EFI boot
451 bootimg = "%s/efi.img" % isodir 445 bootimg = "%s/efi.img" % isodir
452 446