From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by mail.openembedded.org (Postfix) with ESMTP id 2B0C365CAC for ; Mon, 27 Apr 2015 23:36:42 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id DFE0D6E0; Tue, 28 Apr 2015 01:36:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (128-79-216-6.hfc.dyn.abo.bbox.fr [128.79.216.6]) by mail.free-electrons.com (Postfix) with ESMTPSA id 91BDD500; Tue, 28 Apr 2015 01:36:48 +0200 (CEST) Date: Tue, 28 Apr 2015 01:36:42 +0200 From: Alexandre Belloni To: openembedded-core@lists.openembedded.org Message-ID: <20150427233642.GB3687@piout.net> References: <1430177347-15550-1-git-send-email-alexandre.belloni@free-electrons.com> MIME-Version: 1.0 In-Reply-To: <1430177347-15550-1-git-send-email-alexandre.belloni@free-electrons.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH] wic: remove intermediate partitions X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 23:36:45 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, On 28/04/2015 at 01:29:07 +0200, Alexandre Belloni wrote : > 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. > I forgot to add that this fixes #7573. > Signed-off-by: Alexandre Belloni > --- > scripts/lib/wic/kickstart/custom_commands/partition.py | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py > index ff906010b8bf..b228b0d73902 100644 > --- a/scripts/lib/wic/kickstart/custom_commands/partition.py > +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py > @@ -230,6 +230,7 @@ class Wic_PartData(Mic_PartData): > image_rootfs = rootfs_dir > rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype) > > + exec_cmd("rm -f %s" % rootfs) > du_cmd = "du -ks %s" % image_rootfs > out = exec_cmd(du_cmd) > actual_rootfs_size = int(out.split()[0]) > @@ -281,6 +282,7 @@ class Wic_PartData(Mic_PartData): > image_rootfs = rootfs_dir > rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype) > > + exec_cmd("rm -f %s" % rootfs) > du_cmd = "du -ks %s" % image_rootfs > out = exec_cmd(du_cmd) > actual_rootfs_size = int(out.split()[0]) > @@ -325,6 +327,7 @@ class Wic_PartData(Mic_PartData): > image_rootfs = rootfs_dir > rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype) > > + exec_cmd("rm -f %s" % rootfs) > du_cmd = "du -bks %s" % image_rootfs > out = exec_cmd(du_cmd) > blocks = int(out.split()[0]) > @@ -377,6 +380,7 @@ class Wic_PartData(Mic_PartData): > image_rootfs = rootfs_dir > rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype) > > + exec_cmd("rm -f %s" % rootfs) > squashfs_cmd = "mksquashfs %s %s -noappend" % \ > (image_rootfs, rootfs) > 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) > > + exec_cmd("rm -f %s" % fs) > dd_cmd = "dd if=/dev/zero of=%s bs=1k seek=%d count=0" % \ > (fs, self.size) > exec_cmd(dd_cmd) > @@ -442,6 +447,7 @@ class Wic_PartData(Mic_PartData): > """ > fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) > > + exec_cmd("rm -f %s" % fs) > dd_cmd = "dd if=/dev/zero of=%s bs=1k seek=%d count=0" % \ > (fs, self.size) > exec_cmd(dd_cmd) > @@ -466,6 +472,7 @@ class Wic_PartData(Mic_PartData): > Prepare an empty vfat partition. > """ > fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) > + exec_cmd("rm -f %s" % fs) > > blocks = self.size > > @@ -492,6 +499,7 @@ class Wic_PartData(Mic_PartData): > "Proceeding as requested." % self.mountpoint) > > fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) > + exec_cmd("rm -f %s" % fs) > > # it is not possible to create a squashfs without source data, > # thus prepare an empty temp dir that is used as source > -- > 2.1.4 > -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com