From 89642d36b36d08719a7e8ed319f03cd44f6cb86d Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Fri, 20 Jan 2006 17:19:42 +0000 Subject: [PATCH] Netboot2 fixes for spec parameter checks git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1036 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 +++++-- modules/netboot2_target.py | 16 ++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a159226..deea8e20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.521 2006/01/20 14:34:57 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.522 2006/01/20 17:19:42 rocket Exp $ + + 20 Jan 2006; Eric Edgar modules/netboot2_target.py: + Netboot2 fixes for spec parameter checks 20 Jan 2006; Eric Edgar modules/generic_stage_target.py, modules/stage4_target.py: - add makeopts spec file support. Fix printout typo bug 119635. + add makeopts spec file support. 20 Jan 2006; Chris Gianelloni modules/generic_stage_target.py: diff --git a/modules/netboot2_target.py b/modules/netboot2_target.py index 761764ac..383af277 100644 --- a/modules/netboot2_target.py +++ b/modules/netboot2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/netboot2_target.py,v 1.1 2006/01/13 15:09:07 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/netboot2_target.py,v 1.2 2006/01/20 17:19:42 rocket Exp $ """ Builder class for a netboot build, version 2 @@ -12,15 +12,16 @@ from generic_stage_target import * class netboot2_target(generic_stage_target): def __init__(self,spec,addlargs): - self.valid_values = [ - "netboot2/extra_files", - ] self.required_values=[ "boot/kernel", "netboot2/builddate", "netboot2/busybox_config", - "netboot2/packages" + "netboot2/packages", + "netboot2/use" ] + self.valid_values=self.required_values[:] + self.valid_values.extend(self.required_values) + self.valid_values.extend(["netboot2/extra_files"]) try: if addlargs.has_key("netboot2/packages"): @@ -28,13 +29,16 @@ class netboot2_target(generic_stage_target): loopy=[addlargs["netboot2/packages"]] else: loopy=addlargs["netboot2/packages"] + + for x in loopy: + self.valid_values.append("netboot2/packages/"+x+"/files") except: raise CatalystError,"configuration error in netboot2/packages." generic_stage_target.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) + self.set_build_kernel_vars() # Merge packages into the buildroot, and pick out certain files to place in # /tmp/image -- 2.26.2