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 A687913894A for ; Sat, 9 Feb 2013 20:45:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C4B921C097; Sat, 9 Feb 2013 20:45:49 +0000 (UTC) Received: from vms173011pub.verizon.net (vms173011pub.verizon.net [206.46.173.11]) by pigeon.gentoo.org (Postfix) with ESMTP id 9EB8D21C097 for ; Sat, 9 Feb 2013 20:45:48 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.84.219]) by vms173011.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MHZ00CPO0C9RH90@vms173011.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Sat, 09 Feb 2013 14:45:46 -0600 (CST) Received: by odin.tremily.us (Postfix, from userid 1000) id ED4D9878CA0; Sat, 09 Feb 2013 15:45:44 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1360442744; bh=Svwv/Wopfrr76Sko7ZMTQGD8pu8HwvKLoGKbLbZ+/sA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=NfQyIHTMkf9dW9PbYN2faRDnN9X39sBAZ+73925H6F0HHg9XOJreMTvdMjBJh4umk v7iJ2QHsePyNvT9JGqyiDlREN+bh32TkBwJ/+0R9lp1YKcyeYqNSyzi74UjkmhvLkv HrtR0iITZYBpyVFilcRL5A4Tdgn8BB8xGdcXil3U= From: "W. Trevor King" To: Catalyst Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 4/6] generic_stage_target: Split ._copy_initramfs_overlay() from ._build_kernel() Date: Sat, 09 Feb 2013 15:45:36 -0500 Message-id: <10710797031dcd37fce211a38550fbb9f9a15f52.1360442556.git.wking@tremily.us> X-Mailer: git-send-email 1.7.12.4 In-reply-to: References: In-reply-to: References: Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 2255dcdb-1374-4c07-9362-3d48db2ba2aa X-Archives-Hash: fbbbb5a3c5fc42d9e436799e71e60911 From: "W. Trevor King" _copy_initramfs_overlay() is long enough that it makes reading _build_kernel() difficult. --- modules/generic_stage_target.py | 41 ++++++++++++++++++++++------------------- 1 file 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"): -- 1.8.1.336.g94702dd