From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C5B101393F1 for ; Wed, 16 Sep 2015 22:08:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FBFF21C02B; Wed, 16 Sep 2015 22:08:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFA8C21C02B for ; Wed, 16 Sep 2015 22:08:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4E923408E5 for ; Wed, 16 Sep 2015 22:08:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 394B818C for ; Wed, 16 Sep 2015 22:08:24 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1442441586.f496edb2c69a19f25f5398c144ef84608b9dce1a.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/ISOIt.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: f496edb2c69a19f25f5398c144ef84608b9dce1a X-VCS-Branch: master Date: Wed, 16 Sep 2015 22:08:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0ec85319-01cc-47b1-83a6-a727fc29d45e X-Archives-Hash: defc4c53e413f1d393c2be1ba591b30c commit: f496edb2c69a19f25f5398c144ef84608b9dce1a Author: Anthony G. Basile gentoo org> AuthorDate: Wed Sep 16 22:13:06 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Sep 16 22:13:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=f496edb2 grs/ISOIt.py: mksquashfs and mkisofs can take a long time. grs/ISOIt.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/grs/ISOIt.py b/grs/ISOIt.py index 49b97bf..a8973c6 100644 --- a/grs/ISOIt.py +++ b/grs/ISOIt.py @@ -120,10 +120,11 @@ class ISOIt(HashIt): # If this fails, we'll have to rebuild the kernel! #shutil.rmtree(kernelimage_dir, ignore_errors=True) - # 3. make the squashfs image and copy it into the iso/boot + # 3. Make the squashfs image and copy it into the iso/boot. + # This can take a long time. squashfs_path = os.path.join(iso_dir, 'rootfs') cmd = 'mksquashfs %s %s -xattrs -comp xz' % (self.portage_configroot, squashfs_path) - Execute(cmd, timeout=600, logfile=self.logfile) + Execute(cmd, timeout=None, logfile=self.logfile) # 4. Emerge grub:0 to grab stage2_eltorito grub_root = os.path.join(self.tmpdir, 'grub') @@ -135,7 +136,7 @@ class ISOIt(HashIt): shutil.copy(eltorito_path, isogrub_dir) shutil.copy(menulst_path, isogrub_dir) - # 5. create the iso image + # 5. Create the iso image. This can take a long time. args = '-R ' # Rock Ridge protocol args += '-b boot/grub/stage2_eltorito ' # El Torito boot image args += '-no-emul-boot ' # No disk emulation for El Torito @@ -143,4 +144,4 @@ class ISOIt(HashIt): args += '-boot-info-table ' # Create El Torito boot info table medium_path = os.path.join(self.tmpdir, self.medium_name) cmd = 'mkisofs %s -o %s %s' % (args, medium_path, iso_dir) - Execute(cmd, timeout=600, logfile=self.logfile) + Execute(cmd, timeout=None, logfile=self.logfile)