add makeopts spec file support. Fix printout typo bug 119635.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1035 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index c5833b688b6d6e89252a0b0a5ba7a11cfc60637e..8a159226977ad826227a51a2e3099c0ba7d4cc93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.520 2006/01/20 14:32:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.521 2006/01/20 14:34:57 rocket Exp $
+
+  20 Jan 2006; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py, modules/stage4_target.py:
+  add makeopts spec file support.  Fix printout typo bug 119635.
 
   20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index ef8b5026c0d946122a0711d98795358c1afec877..6ee44fe977825cb5e78f614a03d819639b60c3c8 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_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/generic_stage_target.py,v 1.120 2006/01/20 14:32:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.121 2006/01/20 14:34:57 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -20,7 +20,7 @@ class generic_stage_target(generic_target):
                
                self.valid_values.extend(["version_stamp","target","subarch","rel_type","profile",\
                        "snapshot","source_subpath","portage_confdir","cflags","cxxflags",\
-                       "ldflags","chost","hostuse","portage_overlay","distcc_hosts"])
+                       "ldflags","chost","hostuse","portage_overlay","distcc_hosts","makeopts"])
                
                self.set_valid_build_kernel_vars(addlargs)
                generic_target.__init__(self,myspec,addlargs)
@@ -1013,7 +1013,9 @@ class generic_stage_target(generic_target):
                        elif type(self.settings[x])==types.ListType:
                                #os.environ[varname]=string.join(self.settings[x])
                                self.env[varname]=string.join(self.settings[x])
-       
+               if self.settings.has_key("makeopts"):
+                       self.env["MAKEOPTS"]=self.settings["makeopts"]
+                       
        def run(self):
                self.chroot_lock.write_lock()
 

diff --git a/modules/stage4_target.py b/modules/stage4_target.py
index 1bffd6db6068bfb3f3e6a10a9b0d85a572acd67c..f1b61e29d7364b8bc29f386574bf178783404f8b 100644 (file)
--- a/modules/stage4_target.py
+++ b/modules/stage4_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/stage4_target.py,v 1.17 2006/01/17 20:39:15 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.18 2006/01/20 14:34:57 rocket Exp $
 
 """
 Builder class for stage4.
@@ -14,7 +14,7 @@ class stage4_target(generic_stage_target):
                self.required_values=[]
                self.valid_values=self.required_values[:]
                self.valid_values.extend(["stage4/use","stage4/packages","stage4/root_overlay", "stage4/fsscript", \
-                               "stage4/rcadd","stage4/rcdel","stage4/linuxrc","chost","cflags","ldflags","cxxflags","boot/kernel"])
+                               "stage4/rcadd","stage4/rcdel","stage4/linuxrc","boot/kernel"])
                generic_stage_target.__init__(self,spec,addlargs)
 
        def set_cleanables(self):