Fix broken "preserve_libs" commit - ";" is not ":".

[catalyst.git] / modules / embedded_target.py

diff --git a/modules/embedded_target.py b/modules/embedded_target.py
index 98cab48526ffd5408d7dddf1263234d74728b0f0..f38ea00dd531f567dfe2e293fddf8253fe074d8c 100644 (file)
--- a/modules/embedded_target.py
+++ b/modules/embedded_target.py
@@ -1,16 +1,14 @@
-# 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.17 2005/12/02 19:37:02 wolf31o2 Exp $
-
 """
-This class works like a 'stage3'.  A stage2 tarball is unpacked, but instead
-of building a stage3, it emerges a 'system' into another directory
-inside the 'stage2' system.  This way we do not have to emerge gcc/portage
-into the staged system.
+Enbedded target, similar to the stage2 target, builds upon a stage2 tarball.
 
-It sounds real complicated but basically it runs
-ROOT=/tmp/submerge emerge --blahblah foo bar
+A stage2 tarball is unpacked, but instead
+of building a stage3, it emerges @system into another directory
+inside the stage2 system.  This way, we do not have to emerge GCC/portage
+into the staged system.
+It may sound complicated but basically it runs
+ROOT=/tmp/submerge emerge --something foo bar .
 """
+# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
 import os,string,imp,types,shutil
 from catalyst_support import *
@@ -18,37 +16,36 @@ from generic_stage_target import *
 from stat import *
 
 class embedded_target(generic_stage_target):
-
+       """
+       Builder class for embedded 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/use"])
-        if addlargs.has_key("embedded/fs-type"):
-            self.valid_values.append("embedded/fs-ops")
-
-       generic_stage_target.__init__(self,spec,addlargs)
-       self.set_build_kernel_vars(addlargs)
-
-    def set_action_sequence(self):
-       self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\
+               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","embedded/linuxrc"])
+               self.valid_values.extend(["embedded/use"])
+               if "embedded/fs-type" in addlargs:
+                       self.valid_values.append("embedded/fs-ops")
+
+               generic_stage_target.__init__(self,spec,addlargs)
+               self.set_build_kernel_vars(addlargs)
+
+       def set_action_sequence(self):
+               self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\
                                        "config_profile_link","setup_confdir",\
                                        "portage_overlay","bind","chroot_setup",\
                                        "setup_environment","build_kernel","build_packages",\
                                        "bootloader","root_overlay","fsscript","unmerge",\
                                        "unbind","remove","empty","clean","capture","clear_autoresume"]
 
-    def set_stage_path(self):
-        self.settings["stage_path"]=normpath(self.settings["chroot_path"]+"/tmp/mergeroot")
-       print "embedded stage path is "+self.settings["stage_path"]
+       def set_stage_path(self):
+               self.settings["stage_path"]=normpath(self.settings["chroot_path"]+"/tmp/mergeroot")
+               print "embedded stage path is "+self.settings["stage_path"]
 
-    def set_root_path(self):
-        self.settings["root_path"]=normpath("/tmp/mergeroot")
-       print "embedded root path is "+self.settings["root_path"]
+       def set_root_path(self):
+               self.settings["root_path"]=normpath("/tmp/mergeroot")
+               print "embedded root path is "+self.settings["root_path"]
 
-    def set_dest_path(self):
-       self.settings["destpath"]=normpath(self.settings["chroot_path"]+self.settings["root_path"])
-               
 def register(foo):
-        foo.update({"embedded":embedded_target})
-        return foo
+       foo.update({"embedded":embedded_target})
+       return foo