Added linuxrc to embedded and stage4 targets.

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

diff --git a/ChangeLog b/ChangeLog
index 150e9ef9fb8ce26444a6ba7926e0bdb81340edf4..bb0e3aaec11c04ff7651d9602c5980dc0b4bf321 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.501 2006/01/10 15:46:22 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.502 2006/01/10 19:32:47 wolf31o2 Exp $
+
+  10 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/embedded_target.py, modules/stage4_target.py:
+  Added linuxrc to embedded and stage4 targets.
 
   10 Jan 2006; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py, targets/support/kmerge.sh:

diff --git a/modules/embedded_target.py b/modules/embedded_target.py
index 26c510a3bd74638aee19ed5cbb02a5e0ba31784c..217e09bffc9d0499618c9c2ddc5b4303b50def02 100644 (file)
--- a/modules/embedded_target.py
+++ b/modules/embedded_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/embedded_target.py,v 1.19 2005/12/28 16:58:43 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/embedded_target.py,v 1.20 2006/01/10 19:32:47 wolf31o2 Exp $
 
 """
 This class works like a 'stage3'.  A stage2 tarball is unpacked, but instead
@@ -22,7 +22,7 @@ class embedded_target(generic_stage_target):
     def __init__(self,spec,addlargs):
         self.required_values=[]
         self.valid_values=[]
-        self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/fs-type","embedded/runscript","boot/kernel"])
+        self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/fs-type","embedded/runscript","boot/kernel","embedded/linuxrc"])
        self.valid_values.extend(["embedded/use"])
         if addlargs.has_key("embedded/fs-type"):
             self.valid_values.append("embedded/fs-ops")

diff --git a/modules/stage4_target.py b/modules/stage4_target.py
index edc6d69bab2f399fdb4d684feec3c246d58b29a0..132312ed6523ea20cdfd7d6b9dc71e2d55f64936 100644 (file)
--- a/modules/stage4_target.py
+++ b/modules/stage4_target.py
@@ -1,9 +1,9 @@
 # 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.15 2005/12/28 11:56:17 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.16 2006/01/10 19:32:47 wolf31o2 Exp $
 
 """
-Builder class for LiveCD stage1.
+Builder class for stage4.
 """
 
 from catalyst_support import *
@@ -13,8 +13,8 @@ class stage4_target(generic_stage_target):
        def __init__(self,spec,addlargs):
                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","chost","cflags","ldflags","cxxflags"])
+               self.valid_values.extend(["stage4/use","stage4/packages","stage4/root_overlay", "stage4/fsscript", \
+                               "stage4/rcadd","stage4/rcdel","stage4/linuxrc","chost","cflags","ldflags","cxxflags"])
                generic_stage_target.__init__(self,spec,addlargs)
 
        def set_cleanables(self):