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 9F1AB138206 for ; Mon, 15 Jan 2018 01:23:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B21E3E0922; Mon, 15 Jan 2018 01:23:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8CE89E0922 for ; Mon, 15 Jan 2018 01:23:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B795E335C38 for ; Mon, 15 Jan 2018 01:23:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE15F126 for ; Mon, 15 Jan 2018 01:23:37 +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: <1515979411.07caf3e213b541c6e165e1d65d73640cb2deee10.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/Kernel.py grs/Netboot.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 07caf3e213b541c6e165e1d65d73640cb2deee10 X-VCS-Branch: master Date: Mon, 15 Jan 2018 01:23:37 +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: eb74cdde-a129-49b7-84dc-2008d7e7275b X-Archives-Hash: 1e25eda32c8fa91047b79a9b4e1c3236 commit: 07caf3e213b541c6e165e1d65d73640cb2deee10 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Jan 15 01:23:31 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jan 15 01:23:31 2018 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=07caf3e2 grs/Netboot.py: return to using busybox from system root grs/Kernel.py | 1 - grs/Netboot.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/grs/Kernel.py b/grs/Kernel.py index 924bdf9..fe411bd 100644 --- a/grs/Kernel.py +++ b/grs/Kernel.py @@ -123,7 +123,6 @@ class Kernel(): cmd += '--module-prefix=%s ' % image_dir cmd += '--modprobedir=%s ' % modprobe_dir cmd += '--arch-override=%s ' % arch - cmd += '--utils-arch=%s ' % arch if has_modules: cmd += 'all' else: diff --git a/grs/Netboot.py b/grs/Netboot.py index 6b1fe7c..976a24d 100644 --- a/grs/Netboot.py +++ b/grs/Netboot.py @@ -81,6 +81,7 @@ class Netboot(HashIt): a kernel and initramfs is to drop the Kernel.py module altogether and emerge genkernel in the fledgeling system via the script directive, set genkernel.conf via the populate directive and then just run genkernel. + ''' # 2.5 Don't trust genkernel's busybox, but copy in our own version # built in the system chroot. This ensures it will work on the @@ -89,7 +90,6 @@ class Netboot(HashIt): busybox_src = os.path.join(self.portage_configroot, 'bin/busybox') busybox_dst = os.path.join(self.kernelroot, 'initramfs/bin/busybox') shutil.copy(busybox_src, busybox_dst) - ''' # 3. Make the squashfs image in the tmpdir directory. squashfs_dir = os.path.join(initramfs_root, 'mnt/cdrom')