MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wic: remove intermediate partitions

Browse Source 
Remove intermediate partitions that may have been created by a previous
wic invocation. Those partitions are causing issues on some systems. In
particular vfat partition creation is hanging on mcopy execution on
Fedora.

(From OE-Core rev: 8d2587d87601a7ff0fad840dabc07d66363b2810)

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexandre Belloni 2015-05-08 21:17:14 +02:00 committed by Richard Purdie
parent 71626c1b94
commit c2bb6022fe
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/lib/wic/kickstart/custom_commands/partition.py
View File

@ -230,6 +230,7 @@ class Wic_PartData(Mic_PartData):
image_rootfs = rootfs_dir image_rootfs = rootfs_dir
rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype) rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype)
os.remove(rootfs)
du_cmd = "du -ks %s" % image_rootfs du_cmd = "du -ks %s" % image_rootfs
out = exec_cmd(du_cmd) out = exec_cmd(du_cmd)
actual_rootfs_size = int(out.split()[0]) actual_rootfs_size = int(out.split()[0])
@ -281,6 +282,7 @@ class Wic_PartData(Mic_PartData):
image_rootfs = rootfs_dir image_rootfs = rootfs_dir
rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype) rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype)
os.remove(rootfs)
du_cmd = "du -ks %s" % image_rootfs du_cmd = "du -ks %s" % image_rootfs
out = exec_cmd(du_cmd) out = exec_cmd(du_cmd)
actual_rootfs_size = int(out.split()[0]) actual_rootfs_size = int(out.split()[0])
@ -325,6 +327,7 @@ class Wic_PartData(Mic_PartData):
image_rootfs = rootfs_dir image_rootfs = rootfs_dir
rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype) rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype)
os.remove(rootfs)
du_cmd = "du -bks %s" % image_rootfs du_cmd = "du -bks %s" % image_rootfs
out = exec_cmd(du_cmd) out = exec_cmd(du_cmd)
blocks = int(out.split()[0]) blocks = int(out.split()[0])
@ -377,6 +380,7 @@ class Wic_PartData(Mic_PartData):
image_rootfs = rootfs_dir image_rootfs = rootfs_dir
rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype) rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype)
os.remove(rootfs)
squashfs_cmd = "mksquashfs %s %s -noappend" % \ squashfs_cmd = "mksquashfs %s %s -noappend" % \
(image_rootfs, rootfs) (image_rootfs, rootfs)
exec_native_cmd(pseudo + squashfs_cmd, native_sysroot) exec_native_cmd(pseudo + squashfs_cmd, native_sysroot)
@ -415,6 +419,7 @@ class Wic_PartData(Mic_PartData):
""" """
fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
os.remove(fs)
dd_cmd = "dd if=/dev/zero of=%s bs=1k seek=%d count=0" % \ dd_cmd = "dd if=/dev/zero of=%s bs=1k seek=%d count=0" % \
(fs, self.size) (fs, self.size)
exec_cmd(dd_cmd) exec_cmd(dd_cmd)
@ -442,6 +447,7 @@ class Wic_PartData(Mic_PartData):
""" """
fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
os.remove(fs)
dd_cmd = "dd if=/dev/zero of=%s bs=1k seek=%d count=0" % \ dd_cmd = "dd if=/dev/zero of=%s bs=1k seek=%d count=0" % \
(fs, self.size) (fs, self.size)
exec_cmd(dd_cmd) exec_cmd(dd_cmd)
@ -466,6 +472,7 @@ class Wic_PartData(Mic_PartData):
Prepare an empty vfat partition. Prepare an empty vfat partition.
""" """
fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
os.remove(fs)
blocks = self.size blocks = self.size
@ -492,6 +499,7 @@ class Wic_PartData(Mic_PartData):
"Proceeding as requested." % self.mountpoint) "Proceeding as requested." % self.mountpoint)
fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
os.remove(fs)
# it is not possible to create a squashfs without source data, # it is not possible to create a squashfs without source data,
# thus prepare an empty temp dir that is used as source # thus prepare an empty temp dir that is used as source