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 632E213894B for ; Sat, 9 Feb 2013 20:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EED3E21C0F1; Sat, 9 Feb 2013 20:46:07 +0000 (UTC) Received: from vms173003pub.verizon.net (vms173003pub.verizon.net [206.46.173.3]) by pigeon.gentoo.org (Postfix) with ESMTP id 8DA7D21C0F1 for ; Sat, 9 Feb 2013 20:46:07 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.84.219]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MHZ00JX80C9GY80@vms173003.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Sat, 09 Feb 2013 14:46:07 -0600 (CST) Received: by odin.tremily.us (Postfix, from userid 1000) id 2DD40878CA5; 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=1360442745; bh=fLJTCRWk02T2e0TloJHO9Cb74CylOv3BoXEWi5REFZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=M+Y9aLCIg9z4GtegAvuBSgPCJyG7mqQrL9LebsrXiuCcgtg5mxsUrQNw+3p/UIWDh kkf9CcTZ6sNDH3sLm0hxCxioo80JDzMMwDIE/R8uQCPc5dip5TqhymeBBCJFYQlxeH Q+i4AFtbViYyk9ws7XPLRDc9wfQ3EO+mzTrrnLAw= From: "W. Trevor King" To: Catalyst Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 5/6] generic_stage_target: Handle unspecified boot/kernel//config Date: Sat, 09 Feb 2013 15:45:37 -0500 Message-id: <6125f8eb859461cb47bc3a907bc7198a25d56d9b.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: 48eefa83-161a-4ae3-bb28-b79e82bfa1e7 X-Archives-Hash: bccbddeb9f893541d56319f492f43ded From: "W. Trevor King" If boot/kernel//config is not set, make _copy_kernel_config a no-op. --- modules/generic_stage_target.py | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index e741fcd..31cb025 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1426,7 +1426,6 @@ class generic_stage_target(generic_target): +"build_kernel_"+kname): print "Resume point detected, skipping build_kernel for "+kname+" operation..." return - # TODO: make this not require a kernel config self._copy_kernel_config(kname=kname) """ @@ -1478,7 +1477,7 @@ class generic_stage_target(generic_target): "Runscript post-kmerge failed",env=self.env) def _copy_kernel_config(self, kname): - try: + if "boot/kernel/"+kname+"/config" in self.settings: if not os.path.exists(self.settings["boot/kernel/"+kname+"/config"]): self.unbind() raise CatalystError,\ @@ -1486,21 +1485,17 @@ class generic_stage_target(generic_target): self.settings["boot/kernel/"+kname+\ "/config"] - except TypeError: - raise CatalystError,\ - "Required value boot/kernel/config not specified" + try: + cmd("cp "+self.settings["boot/kernel/"+kname+\ + "/config"]+" "+\ + self.settings["chroot_path"]+"/var/tmp/"+\ + kname+".config",\ + "Couldn't copy kernel config: "+\ + self.settings["boot/kernel/"+kname+\ + "/config"],env=self.env) - try: - cmd("cp "+self.settings["boot/kernel/"+kname+\ - "/config"]+" "+\ - self.settings["chroot_path"]+"/var/tmp/"+\ - kname+".config",\ - "Couldn't copy kernel config: "+\ - self.settings["boot/kernel/"+kname+\ - "/config"],env=self.env) - - except CatalystError: - self.unbind() + except CatalystError: + self.unbind() def _copy_initramfs_overlay(self, kname): if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: -- 1.8.1.336.g94702dd