From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F953138330 for ; Wed, 10 Jan 2018 21:02:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52D1BE0A6D; Wed, 10 Jan 2018 21:02:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3525BE0A6D for ; Wed, 10 Jan 2018 21:02:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC7B2335C38 for ; Wed, 10 Jan 2018 21:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 327AC196 for ; Wed, 10 Jan 2018 21:02:14 +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: <1515618115.7fdb50bd3be0467d2bfefac8fde9554ed7956cce.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/Netboot.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 7fdb50bd3be0467d2bfefac8fde9554ed7956cce X-VCS-Branch: master Date: Wed, 10 Jan 2018 21:02:14 +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: 3ed4f4f9-b8cf-4985-8f1c-bca7ff2cda8e X-Archives-Hash: 46437c8095965afa8fe45b876745b963 commit: 7fdb50bd3be0467d2bfefac8fde9554ed7956cce Author: Anthony G. Basile gentoo org> AuthorDate: Wed Jan 10 21:01:55 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Jan 10 21:01:55 2018 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=7fdb50bd grs/Netboot.py: switch from xz to gzip compression grs/Netboot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grs/Netboot.py b/grs/Netboot.py index 985bcfd..307b3b3 100644 --- a/grs/Netboot.py +++ b/grs/Netboot.py @@ -65,9 +65,9 @@ class Netboot(HashIt): shutil.rmtree(initramfs_root, ignore_errors=True) os.makedirs(initramfs_root, mode=0o755, exist_ok=False) - # We will only use xz compression + # We will use gzip compression initramfs_src = os.path.join(self.portage_configroot, 'boot/initramfs') - cmd = 'xz -dc %s | cpio -idv' % (initramfs_src) + cmd = 'cat %s | gunzip | cpio -idv' % (initramfs_src) cwd = os.getcwd() os.chdir(initramfs_root) @@ -95,7 +95,7 @@ class Netboot(HashIt): shutil.rmtree(squashfs_dir, ignore_errors=True) os.makedirs(squashfs_dir, mode=0o755, exist_ok=False) squashfs_path = os.path.join(squashfs_dir, 'image.squashfs') - cmd = 'mksquashfs %s %s -xattrs -comp xz' % (self.portage_configroot, squashfs_path) + cmd = 'mksquashfs %s %s -xattrs -comp gzip' % (self.portage_configroot, squashfs_path) Execute(cmd, timeout=None, logfile=self.logfile) # 4. Copy in the init script @@ -106,7 +106,7 @@ class Netboot(HashIt): # 5. Repack initramfs_dst = os.path.join(self.tmpdir, self.medium_name) - cmd = 'find . -print | cpio -H newc -o | xz -9e --check=none -z -f > %s' % initramfs_dst + cmd = 'find . -print | cpio -H newc -o | gzip -9 -f > %s' % initramfs_dst cwd = os.getcwd() os.chdir(initramfs_root)