From: Eric Edgar <rocket@gentoo.org>
Date: Fri, 23 Dec 2005 06:38:18 +0000 (+0000)
Subject: remove stray \' from arch/sh.py
X-Git-Tag: CATALYST_2_0_6_916~492
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98a65a36ec3e447900843ef16d015df221b79202;p=catalyst.git

remove stray \' from arch/sh.py


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

diff --git a/ChangeLog b/ChangeLog
index b74ff6b8..2917edf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.489 2005/12/21 21:03:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.490 2005/12/23 06:38:18 rocket Exp $
+
+  23 Dec 2005; Eric Edgar <rocket@gentoo.org> arch/sh.py,
+  modules/generic_stage_target.py, modules/stage4_target.py:
+  remove stray ' from arch/sh.py
 
   21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/stage1/stage1-controller.sh:
diff --git a/arch/sh.py b/arch/sh.py
index af0e0c96..90746182 100644
--- a/arch/sh.py
+++ b/arch/sh.py
@@ -1,6 +1,6 @@
-'# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sh.py,v 1.2 2005/12/20 16:28:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sh.py,v 1.3 2005/12/23 06:38:18 rocket Exp $
 
 import builder,os
 from catalyst_support import *
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 32e2a34b..ac6d5ce4 100644
--- 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.106 2005/12/21 15:12:37 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.107 2005/12/23 06:38:18 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -20,7 +20,8 @@ class generic_stage_target(generic_target):
 			"profile","snapshot","source_subpath"])
 		
 		self.valid_values.extend(["version_stamp","target","subarch","rel_type","profile",\
-			"snapshot","source_subpath","portage_confdir","cflags","cxxflags","chost","hostuse"])
+			"snapshot","source_subpath","portage_confdir","cflags","cxxflags",\
+			"ldflags","chost","hostuse"])
 		generic_target.__init__(self,addlargs,myspec)
 		
 		# map the mainarch we are running under to the mainarches we support for
diff --git a/modules/stage4_target.py b/modules/stage4_target.py
index b1d30c2b..a222bdb6 100644
--- 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.13 2005/12/16 14:42:07 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.14 2005/12/23 06:38:18 rocket Exp $
 
 """
 Builder class for LiveCD stage1.
@@ -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/rcadd","stage4/rcdel","chost","cflags","ldflags","cxxflags"])
 		generic_stage_target.__init__(self,spec,addlargs)
 
 	def set_pkgcache_path(self):