Remove references to generic_stage_target

diff --git a/ChangeLog b/ChangeLog
index 3af0270d2314e2b3fc1357e0a7c194ab6a5938a2..8569c7d327362d6ff3ca597a0326671b31fb537f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
+  modules/catalyst/target/embedded.py,
+  modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py,
+  modules/catalyst/target/livecd_stage1.py,
+  modules/catalyst/target/livecd_stage2.py,
+  modules/catalyst/target/netboot.py, modules/catalyst/target/netboot2.py,
+  modules/catalyst/target/snapshot.py, modules/catalyst/target/stage1.py,
+  modules/catalyst/target/stage2.py, modules/catalyst/target/stage3.py,
+  modules/catalyst/target/stage4.py, modules/catalyst/target/tinderbox.py:
+  Remove references to generic_stage_target
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   +modules/catalyst/target/embedded.py,
   -modules/catalyst/target/embedded_target.py,

diff --git a/catalyst b/catalyst
index e050987ed0250c8334094a742ba559dc5378d171..29e00f69f8f890c2999c0e01f6b67ecb9edf0d2b 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -285,7 +285,7 @@ if __name__ == "__main__":
        # import configuration file and import our main module using those settings
        parse_config(myconfig)
 
-       from catalyst_support import *
+       from catalyst.support import *
        
        # Start checking that digests are valid now that the hash_map was imported from catalyst_support
        if conf_values.has_key("digests"):

diff --git a/modules/catalyst/target/embedded.py b/modules/catalyst/target/embedded.py
index 588e1b7428246671bb217b357d466a9bd2c42a86..c0d3464e3e969d695bfcc85a64a878a2efcc5a2d 100644 (file)
--- a/modules/catalyst/target/embedded.py
+++ b/modules/catalyst/target/embedded.py
@@ -11,7 +11,7 @@ ROOT=/tmp/submerge emerge --blahblah foo bar
 
 import os,string,imp,types,shutil
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 from stat import *
 
 class embedded_target(generic_stage_target):

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index edf1c7e6ee338ea5f23fc5f32a6c358b6a2ed529..1a8cdbf32cbcfea19d89b41b0ff9c3b607d7e1bc 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -6,7 +6,7 @@ the driver class for pretty much everything that Catalyst does.
 
 import os,string,imp,types,shutil
 from catalyst.support import *
-from generic_target import *
+from catalyst.target.generic import *
 from stat import *
 import catalyst.lock
 import catalyst.arch

diff --git a/modules/catalyst/target/grp.py b/modules/catalyst/target/grp.py
index 6ccb7823130cd079626a807ad0972187e7cb9195..a805bf3a771b8ad1d9af2c56c368753e7c84f6bc 100644 (file)
--- a/modules/catalyst/target/grp.py
+++ b/modules/catalyst/target/grp.py
@@ -5,7 +5,7 @@ The builder class for GRP (Gentoo Reference Platform) builds.
 
 import os,types,glob
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class grp_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/livecd_stage1.py b/modules/catalyst/target/livecd_stage1.py
index 05e4580e2609ef19e9f2fd94e9ddb96c8cdcf734..eef4896b7cdb715561bdcfe755cfa7219082802f 100644 (file)
--- a/modules/catalyst/target/livecd_stage1.py
+++ b/modules/catalyst/target/livecd_stage1.py
@@ -4,7 +4,7 @@ Builder class for LiveCD stage1.
 """
 
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class livecd_stage1_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/livecd_stage2.py b/modules/catalyst/target/livecd_stage2.py
index a8cd73df54857d0925ea8bb7cbb1ffa84c3a150b..ea5d9ecc78257d5a0f35f568ec813a3703812dd8 100644 (file)
--- a/modules/catalyst/target/livecd_stage2.py
+++ b/modules/catalyst/target/livecd_stage2.py
@@ -5,7 +5,7 @@ Builder class for a LiveCD stage2 build.
 
 import os,string,types,stat,shutil
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class livecd_stage2_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/netboot.py b/modules/catalyst/target/netboot.py
index 2f2591a65c8963ba854ab26b00806660acbb4c00..675ee901d367cad22763ac85ce3baeaf306847a8 100644 (file)
--- a/modules/catalyst/target/netboot.py
+++ b/modules/catalyst/target/netboot.py
@@ -5,7 +5,7 @@ Builder class for a netboot build.
 
 import os,string,types
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class netboot_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/netboot2.py b/modules/catalyst/target/netboot2.py
index c576ad3bdd1114bebf80e2da316376eb946bb5b4..cfb08d37a9000608dc3adf47263810df42dbc45d 100644 (file)
--- a/modules/catalyst/target/netboot2.py
+++ b/modules/catalyst/target/netboot2.py
@@ -5,7 +5,7 @@ Builder class for a netboot build, version 2
 
 import os,string,types
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class netboot2_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py
index eff2f41fb31b2cbc28d2bef2a1797a2e0d4a4754..8f7a7bcb50ce4d86ec6ab9aeb78137b54d3bacf4 100644 (file)
--- a/modules/catalyst/target/snapshot.py
+++ b/modules/catalyst/target/snapshot.py
@@ -5,7 +5,7 @@ Builder class for snapshots.
 
 import os
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class snapshot_target(generic_stage_target):
        def __init__(self,myspec,addlargs):

diff --git a/modules/catalyst/target/stage1.py b/modules/catalyst/target/stage1.py
index fc70dbc52b1856394aea9eb356fa3512cdda9365..3bcfe8039e294ee7955b766421e225aff0ee1ee6 100644 (file)
--- a/modules/catalyst/target/stage1.py
+++ b/modules/catalyst/target/stage1.py
@@ -4,7 +4,7 @@ Builder class for a stage1 installation tarball build.
 """
 
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class stage1_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/stage2.py b/modules/catalyst/target/stage2.py
index 69daec963790bb0825dc85624a543f16539cf8ef..fdaacb99b99d22ea543197ab66c01832bafa3488 100644 (file)
--- a/modules/catalyst/target/stage2.py
+++ b/modules/catalyst/target/stage2.py
@@ -4,7 +4,7 @@ Builder class for a stage2 installation tarball build.
 """
 
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class stage2_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/stage3.py b/modules/catalyst/target/stage3.py
index 07bd4aa8189c740910a4716c10e0a46c5d70211c..2c9ad1baea4a68afdc2ef94b66591632b33111a8 100644 (file)
--- a/modules/catalyst/target/stage3.py
+++ b/modules/catalyst/target/stage3.py
@@ -4,7 +4,7 @@ Builder class for a stage3 installation tarball build.
 """
 
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class stage3_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/stage4.py b/modules/catalyst/target/stage4.py
index c8c758d9e10e41c0dcc6572edf36fee08de0af78..08c4105adb65cb2ef839f7d87d81fbafb39fff15 100644 (file)
--- a/modules/catalyst/target/stage4.py
+++ b/modules/catalyst/target/stage4.py
@@ -4,7 +4,7 @@ Builder class for stage4.
 """
 
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class stage4_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/tinderbox.py b/modules/catalyst/target/tinderbox.py
index 8f14b5e31456074008bf802a00912812a081e882..40cb32075db31aace3e0a308b0a9c52c05d71dd6 100644 (file)
--- a/modules/catalyst/target/tinderbox.py
+++ b/modules/catalyst/target/tinderbox.py
@@ -4,7 +4,7 @@ builder class for the tinderbox target
 """
 
 from catalyst.support import *
-from generic_stage_target import *
+from generic_stage import *
 
 class tinderbox_target(generic_stage_target):
        def __init__(self,spec,addlargs):