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 9BA01198005 for ; Sat, 23 Feb 2013 02:02:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC5A221C009; Sat, 23 Feb 2013 02:02:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC07221C005 for ; Sat, 23 Feb 2013 02:02:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFB8733E162 for ; Sat, 23 Feb 2013 02:02:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4BBB6E4091 for ; Sat, 23 Feb 2013 02:02:31 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1361584935.a1c561ae8fb636e82a9c93863a74c1b423966527.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a1c561ae8fb636e82a9c93863a74c1b423966527 X-VCS-Branch: master Date: Sat, 23 Feb 2013 02:02:31 +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: 2ec4995e-138f-4291-a669-3f7c71deeb77 X-Archives-Hash: 26d232bba3e96b32a62fee2dee5f860a commit: a1c561ae8fb636e82a9c93863a74c1b423966527 Author: W. Trevor King tremily us> AuthorDate: Sat Feb 9 20:45:36 2013 +0000 Commit: Matt Turner gmail com> CommitDate: Sat Feb 23 02:02:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a1c561ae generic_stage_target: Split ._copy_initramfs_overlay() from ._build_kernel() _copy_initramfs_overlay() is long enough that it makes reading _build_kernel() difficult. Reviewed-by: Matt Turner gmail.com> --- modules/generic_stage_target.py | 41 ++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 337ab16..e741fcd 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1452,25 +1452,7 @@ class generic_stage_target(generic_target): self.settings["boot/kernel/"+kname+\ "/extraversion"] - if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: - if os.path.exists(self.settings["boot/kernel/"+\ - kname+"/initramfs_overlay"]): - print "Copying initramfs_overlay dir "+\ - self.settings["boot/kernel/"+kname+\ - "/initramfs_overlay"] - - cmd("mkdir -p "+\ - self.settings["chroot_path"]+\ - "/tmp/initramfs_overlay/"+\ - self.settings["boot/kernel/"+kname+\ - "/initramfs_overlay"],env=self.env) - - cmd("cp -R "+self.settings["boot/kernel/"+\ - kname+"/initramfs_overlay"]+"/* "+\ - self.settings["chroot_path"]+\ - "/tmp/initramfs_overlay/"+\ - self.settings["boot/kernel/"+kname+\ - "/initramfs_overlay"],env=self.env) + self._copy_initramfs_overlay(kname=kname) """ Execute the script that builds the kernel """ cmd("/bin/bash "+self.settings["controller_file"]+\ @@ -1520,6 +1502,27 @@ class generic_stage_target(generic_target): except CatalystError: self.unbind() + def _copy_initramfs_overlay(self, kname): + if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: + if os.path.exists(self.settings["boot/kernel/"+\ + kname+"/initramfs_overlay"]): + print "Copying initramfs_overlay dir "+\ + self.settings["boot/kernel/"+kname+\ + "/initramfs_overlay"] + + cmd("mkdir -p "+\ + self.settings["chroot_path"]+\ + "/tmp/initramfs_overlay/"+\ + self.settings["boot/kernel/"+kname+\ + "/initramfs_overlay"],env=self.env) + + cmd("cp -R "+self.settings["boot/kernel/"+\ + kname+"/initramfs_overlay"]+"/* "+\ + self.settings["chroot_path"]+\ + "/tmp/initramfs_overlay/"+\ + self.settings["boot/kernel/"+kname+\ + "/initramfs_overlay"],env=self.env) + def bootloader(self): if "AUTORESUME" in self.settings \ and os.path.exists(self.settings["autoresume_path"]+"bootloader"):