1 |
commit: 7f72c6b4b226824ee69ffcbf33bf6f6224014ea3 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 12 07:32:41 2013 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Fri Jan 3 06:40:03 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7f72c6b4 |
7 |
|
8 |
Move catalyst_support, builder, catalyst_lock out of modules, into the catalyst namespace. |
9 |
|
10 |
--- |
11 |
catalyst/arch/alpha.py | 6 ++++-- |
12 |
catalyst/arch/amd64.py | 2 +- |
13 |
catalyst/arch/arm.py | 6 ++++-- |
14 |
catalyst/arch/hppa.py | 6 ++++-- |
15 |
catalyst/arch/ia64.py | 6 ++++-- |
16 |
catalyst/arch/mips.py | 6 ++++-- |
17 |
catalyst/arch/powerpc.py | 6 ++++-- |
18 |
catalyst/arch/s390.py | 6 ++++-- |
19 |
catalyst/arch/sh.py | 6 ++++-- |
20 |
catalyst/arch/sparc.py | 6 ++++-- |
21 |
catalyst/arch/x86.py | 6 ++++-- |
22 |
catalyst/{modules => }/builder.py | 0 |
23 |
catalyst/config.py | 3 ++- |
24 |
catalyst/{modules/catalyst_lock.py => lock.py} | 2 +- |
25 |
catalyst/main.py | 7 ++++--- |
26 |
catalyst/modules/embedded_target.py | 2 +- |
27 |
catalyst/modules/generic_stage_target.py | 8 ++++---- |
28 |
catalyst/modules/generic_target.py | 2 +- |
29 |
catalyst/modules/grp_target.py | 2 +- |
30 |
catalyst/modules/livecd_stage1_target.py | 2 +- |
31 |
catalyst/modules/livecd_stage2_target.py | 2 +- |
32 |
catalyst/modules/netboot2_target.py | 2 +- |
33 |
catalyst/modules/netboot_target.py | 2 +- |
34 |
catalyst/modules/snapshot_target.py | 2 +- |
35 |
catalyst/modules/stage1_target.py | 2 +- |
36 |
catalyst/modules/stage2_target.py | 2 +- |
37 |
catalyst/modules/stage3_target.py | 2 +- |
38 |
catalyst/modules/stage4_target.py | 2 +- |
39 |
catalyst/modules/tinderbox_target.py | 2 +- |
40 |
catalyst/{modules/catalyst_support.py => support.py} | 0 |
41 |
30 files changed, 65 insertions(+), 43 deletions(-) |
42 |
|
43 |
diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py |
44 |
index f0fc95a..7248020 100644 |
45 |
--- a/catalyst/arch/alpha.py |
46 |
+++ b/catalyst/arch/alpha.py |
47 |
@@ -1,6 +1,8 @@ |
48 |
|
49 |
-import builder,os |
50 |
-from catalyst_support import * |
51 |
+import os |
52 |
+ |
53 |
+from catalyst import builder |
54 |
+from catalyst.support import * |
55 |
|
56 |
class generic_alpha(builder.generic): |
57 |
"abstract base class for all alpha builders" |
58 |
|
59 |
diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py |
60 |
index 262b55a..13e7563 100644 |
61 |
--- a/catalyst/arch/amd64.py |
62 |
+++ b/catalyst/arch/amd64.py |
63 |
@@ -1,5 +1,5 @@ |
64 |
|
65 |
-import builder |
66 |
+from catalyst import builder |
67 |
|
68 |
class generic_amd64(builder.generic): |
69 |
"abstract base class for all amd64 builders" |
70 |
|
71 |
diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py |
72 |
index 2de3942..8f207ff 100644 |
73 |
--- a/catalyst/arch/arm.py |
74 |
+++ b/catalyst/arch/arm.py |
75 |
@@ -1,6 +1,8 @@ |
76 |
|
77 |
-import builder,os |
78 |
-from catalyst_support import * |
79 |
+import os |
80 |
+ |
81 |
+from catalyst import builder |
82 |
+from catalyst.support import * |
83 |
|
84 |
class generic_arm(builder.generic): |
85 |
"Abstract base class for all arm (little endian) builders" |
86 |
|
87 |
diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py |
88 |
index f804398..3aac9b6 100644 |
89 |
--- a/catalyst/arch/hppa.py |
90 |
+++ b/catalyst/arch/hppa.py |
91 |
@@ -1,6 +1,8 @@ |
92 |
|
93 |
-import builder,os |
94 |
-from catalyst_support import * |
95 |
+import os |
96 |
+ |
97 |
+from catalyst import builder |
98 |
+from catalyst.support import * |
99 |
|
100 |
class generic_hppa(builder.generic): |
101 |
"Abstract base class for all hppa builders" |
102 |
|
103 |
diff --git a/catalyst/arch/ia64.py b/catalyst/arch/ia64.py |
104 |
index 825af70..4003085 100644 |
105 |
--- a/catalyst/arch/ia64.py |
106 |
+++ b/catalyst/arch/ia64.py |
107 |
@@ -1,6 +1,8 @@ |
108 |
|
109 |
-import builder,os |
110 |
-from catalyst_support import * |
111 |
+import os |
112 |
+ |
113 |
+from catalyst import builder |
114 |
+from catalyst.support import * |
115 |
|
116 |
class arch_ia64(builder.generic): |
117 |
"builder class for ia64" |
118 |
|
119 |
diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py |
120 |
index b3730fa..7cce392 100644 |
121 |
--- a/catalyst/arch/mips.py |
122 |
+++ b/catalyst/arch/mips.py |
123 |
@@ -1,6 +1,8 @@ |
124 |
|
125 |
-import builder,os |
126 |
-from catalyst_support import * |
127 |
+import os |
128 |
+ |
129 |
+from catalyst import builder |
130 |
+from catalyst.support import * |
131 |
|
132 |
class generic_mips(builder.generic): |
133 |
"Abstract base class for all mips builders [Big-endian]" |
134 |
|
135 |
diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py |
136 |
index e9f611b..6cec580 100644 |
137 |
--- a/catalyst/arch/powerpc.py |
138 |
+++ b/catalyst/arch/powerpc.py |
139 |
@@ -1,6 +1,8 @@ |
140 |
|
141 |
-import os,builder |
142 |
-from catalyst_support import * |
143 |
+import os |
144 |
+ |
145 |
+from catalyst import builder |
146 |
+from catalyst.support import * |
147 |
|
148 |
class generic_ppc(builder.generic): |
149 |
"abstract base class for all 32-bit powerpc builders" |
150 |
|
151 |
diff --git a/catalyst/arch/s390.py b/catalyst/arch/s390.py |
152 |
index bf22f66..c49e0b7 100644 |
153 |
--- a/catalyst/arch/s390.py |
154 |
+++ b/catalyst/arch/s390.py |
155 |
@@ -1,6 +1,8 @@ |
156 |
|
157 |
-import builder,os |
158 |
-from catalyst_support import * |
159 |
+import os |
160 |
+ |
161 |
+from catalyst import builder |
162 |
+from catalyst.support import * |
163 |
|
164 |
class generic_s390(builder.generic): |
165 |
"abstract base class for all s390 builders" |
166 |
|
167 |
diff --git a/catalyst/arch/sh.py b/catalyst/arch/sh.py |
168 |
index 2fc9531..1fa1b0b 100644 |
169 |
--- a/catalyst/arch/sh.py |
170 |
+++ b/catalyst/arch/sh.py |
171 |
@@ -1,6 +1,8 @@ |
172 |
|
173 |
-import builder,os |
174 |
-from catalyst_support import * |
175 |
+import os |
176 |
+ |
177 |
+from catalyst import builder |
178 |
+from catalyst.support import * |
179 |
|
180 |
class generic_sh(builder.generic): |
181 |
"Abstract base class for all sh builders [Little-endian]" |
182 |
|
183 |
diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py |
184 |
index 5eb5344..2889528 100644 |
185 |
--- a/catalyst/arch/sparc.py |
186 |
+++ b/catalyst/arch/sparc.py |
187 |
@@ -1,6 +1,8 @@ |
188 |
|
189 |
-import builder,os |
190 |
-from catalyst_support import * |
191 |
+import os |
192 |
+ |
193 |
+from catalyst import builder |
194 |
+from catalyst.support import * |
195 |
|
196 |
class generic_sparc(builder.generic): |
197 |
"abstract base class for all sparc builders" |
198 |
|
199 |
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py |
200 |
index 0391b79..c8d1911 100644 |
201 |
--- a/catalyst/arch/x86.py |
202 |
+++ b/catalyst/arch/x86.py |
203 |
@@ -1,6 +1,8 @@ |
204 |
|
205 |
-import builder,os |
206 |
-from catalyst_support import * |
207 |
+import os |
208 |
+ |
209 |
+from catalyst import builder |
210 |
+from catalyst.support import * |
211 |
|
212 |
class generic_x86(builder.generic): |
213 |
"abstract base class for all x86 builders" |
214 |
|
215 |
diff --git a/catalyst/modules/builder.py b/catalyst/builder.py |
216 |
similarity index 100% |
217 |
rename from catalyst/modules/builder.py |
218 |
rename to catalyst/builder.py |
219 |
|
220 |
diff --git a/catalyst/config.py b/catalyst/config.py |
221 |
index 726bf74..460bbd5 100644 |
222 |
--- a/catalyst/config.py |
223 |
+++ b/catalyst/config.py |
224 |
@@ -1,5 +1,6 @@ |
225 |
+ |
226 |
import re |
227 |
-from modules.catalyst_support import * |
228 |
+from catalyst.support import * |
229 |
|
230 |
class ParserBase: |
231 |
|
232 |
|
233 |
diff --git a/catalyst/modules/catalyst_lock.py b/catalyst/lock.py |
234 |
similarity index 99% |
235 |
rename from catalyst/modules/catalyst_lock.py |
236 |
rename to catalyst/lock.py |
237 |
index 5311cf8..2d10d2f 100644 |
238 |
--- a/catalyst/modules/catalyst_lock.py |
239 |
+++ b/catalyst/lock.py |
240 |
@@ -5,7 +5,7 @@ import errno |
241 |
import sys |
242 |
import string |
243 |
import time |
244 |
-from catalyst_support import * |
245 |
+from catalyst.support import * |
246 |
|
247 |
def writemsg(mystr): |
248 |
sys.stderr.write(mystr) |
249 |
|
250 |
diff --git a/catalyst/main.py b/catalyst/main.py |
251 |
index aebb495..7b66dab 100644 |
252 |
--- a/catalyst/main.py |
253 |
+++ b/catalyst/main.py |
254 |
@@ -21,7 +21,7 @@ sys.path.append(__selfpath__ + "/modules") |
255 |
|
256 |
import catalyst.config |
257 |
import catalyst.util |
258 |
-from catalyst.modules.catalyst_support import (required_build_targets, |
259 |
+from catalyst.support import (required_build_targets, |
260 |
valid_build_targets, CatalystError, hash_map, find_binary, LockInUse) |
261 |
|
262 |
__maintainer__="Catalyst <catalyst@g.o>" |
263 |
@@ -196,7 +196,8 @@ def parse_config(myconfig): |
264 |
conf_values["port_logdir"]=myconf["port_logdir"]; |
265 |
|
266 |
def import_modules(): |
267 |
- # import catalyst's own modules (i.e. catalyst_support and the arch modules) |
268 |
+ # import catalyst's own modules |
269 |
+ # (i.e. stage and the arch modules) |
270 |
targetmap={} |
271 |
|
272 |
try: |
273 |
@@ -347,7 +348,7 @@ def main(): |
274 |
parse_config(myconfig) |
275 |
|
276 |
# Start checking that digests are valid now that the hash_map was imported |
277 |
- # from catalyst_support |
278 |
+ # from catalyst.support |
279 |
if "digests" in conf_values: |
280 |
for i in conf_values["digests"].split(): |
281 |
if i not in hash_map: |
282 |
|
283 |
diff --git a/catalyst/modules/embedded_target.py b/catalyst/modules/embedded_target.py |
284 |
index f38ea00..7cee7a6 100644 |
285 |
--- a/catalyst/modules/embedded_target.py |
286 |
+++ b/catalyst/modules/embedded_target.py |
287 |
@@ -11,7 +11,7 @@ ROOT=/tmp/submerge emerge --something foo bar . |
288 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
289 |
|
290 |
import os,string,imp,types,shutil |
291 |
-from catalyst_support import * |
292 |
+from catalyst.support import * |
293 |
from generic_stage_target import * |
294 |
from stat import * |
295 |
|
296 |
|
297 |
diff --git a/catalyst/modules/generic_stage_target.py b/catalyst/modules/generic_stage_target.py |
298 |
index ab4aa7a..4ca9791 100644 |
299 |
--- a/catalyst/modules/generic_stage_target.py |
300 |
+++ b/catalyst/modules/generic_stage_target.py |
301 |
@@ -1,8 +1,8 @@ |
302 |
import os,string,imp,types,shutil |
303 |
-from catalyst_support import * |
304 |
+from catalyst.support import * |
305 |
from generic_target import * |
306 |
from stat import * |
307 |
-import catalyst_lock |
308 |
+from catalyst.lock import LockDir |
309 |
|
310 |
|
311 |
PORT_LOGDIR_CLEAN = \ |
312 |
@@ -471,7 +471,7 @@ class generic_stage_target(generic_target): |
313 |
normpath(self.settings["snapshot_cache"]+"/"+\ |
314 |
self.settings["snapshot"]) |
315 |
self.snapcache_lock=\ |
316 |
- catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) |
317 |
+ LockDir(self.settings["snapshot_cache_path"]) |
318 |
print "Caching snapshot to "+self.settings["snapshot_cache_path"] |
319 |
|
320 |
def set_chroot_path(self): |
321 |
@@ -481,7 +481,7 @@ class generic_stage_target(generic_target): |
322 |
""" |
323 |
self.settings["chroot_path"]=normpath(self.settings["storedir"]+\ |
324 |
"/tmp/"+self.settings["target_subpath"]) |
325 |
- self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"]) |
326 |
+ self.chroot_lock=LockDir(self.settings["chroot_path"]) |
327 |
|
328 |
def set_autoresume_path(self): |
329 |
self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\ |
330 |
|
331 |
diff --git a/catalyst/modules/generic_target.py b/catalyst/modules/generic_target.py |
332 |
index fe96bd7..de51994 100644 |
333 |
--- a/catalyst/modules/generic_target.py |
334 |
+++ b/catalyst/modules/generic_target.py |
335 |
@@ -1,4 +1,4 @@ |
336 |
-from catalyst_support import * |
337 |
+from catalyst.support import * |
338 |
|
339 |
class generic_target: |
340 |
""" |
341 |
|
342 |
diff --git a/catalyst/modules/grp_target.py b/catalyst/modules/grp_target.py |
343 |
index 6941522..8e70042 100644 |
344 |
--- a/catalyst/modules/grp_target.py |
345 |
+++ b/catalyst/modules/grp_target.py |
346 |
@@ -4,7 +4,7 @@ Gentoo Reference Platform (GRP) target |
347 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
348 |
|
349 |
import os,types,glob |
350 |
-from catalyst_support import * |
351 |
+from catalyst.support import * |
352 |
from generic_stage_target import * |
353 |
|
354 |
class grp_target(generic_stage_target): |
355 |
|
356 |
diff --git a/catalyst/modules/livecd_stage1_target.py b/catalyst/modules/livecd_stage1_target.py |
357 |
index 59de9bb..ac846ec 100644 |
358 |
--- a/catalyst/modules/livecd_stage1_target.py |
359 |
+++ b/catalyst/modules/livecd_stage1_target.py |
360 |
@@ -3,7 +3,7 @@ LiveCD stage1 target |
361 |
""" |
362 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
363 |
|
364 |
-from catalyst_support import * |
365 |
+from catalyst.support import * |
366 |
from generic_stage_target import * |
367 |
|
368 |
class livecd_stage1_target(generic_stage_target): |
369 |
|
370 |
diff --git a/catalyst/modules/livecd_stage2_target.py b/catalyst/modules/livecd_stage2_target.py |
371 |
index 5be8fd2..1bfd820 100644 |
372 |
--- a/catalyst/modules/livecd_stage2_target.py |
373 |
+++ b/catalyst/modules/livecd_stage2_target.py |
374 |
@@ -4,7 +4,7 @@ LiveCD stage2 target, builds upon previous LiveCD stage1 tarball |
375 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
376 |
|
377 |
import os,string,types,stat,shutil |
378 |
-from catalyst_support import * |
379 |
+from catalyst.support import * |
380 |
from generic_stage_target import * |
381 |
|
382 |
class livecd_stage2_target(generic_stage_target): |
383 |
|
384 |
diff --git a/catalyst/modules/netboot2_target.py b/catalyst/modules/netboot2_target.py |
385 |
index 1ab7e7d..2b3cd20 100644 |
386 |
--- a/catalyst/modules/netboot2_target.py |
387 |
+++ b/catalyst/modules/netboot2_target.py |
388 |
@@ -4,7 +4,7 @@ netboot target, version 2 |
389 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
390 |
|
391 |
import os,string,types |
392 |
-from catalyst_support import * |
393 |
+from catalyst.support import * |
394 |
from generic_stage_target import * |
395 |
|
396 |
class netboot2_target(generic_stage_target): |
397 |
|
398 |
diff --git a/catalyst/modules/netboot_target.py b/catalyst/modules/netboot_target.py |
399 |
index ff2c81f..9d01b7e 100644 |
400 |
--- a/catalyst/modules/netboot_target.py |
401 |
+++ b/catalyst/modules/netboot_target.py |
402 |
@@ -4,7 +4,7 @@ netboot target, version 1 |
403 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
404 |
|
405 |
import os,string,types |
406 |
-from catalyst_support import * |
407 |
+from catalyst.support import * |
408 |
from generic_stage_target import * |
409 |
|
410 |
class netboot_target(generic_stage_target): |
411 |
|
412 |
diff --git a/catalyst/modules/snapshot_target.py b/catalyst/modules/snapshot_target.py |
413 |
index ba1bab5..d1b9e40 100644 |
414 |
--- a/catalyst/modules/snapshot_target.py |
415 |
+++ b/catalyst/modules/snapshot_target.py |
416 |
@@ -3,7 +3,7 @@ Snapshot target |
417 |
""" |
418 |
|
419 |
import os |
420 |
-from catalyst_support import * |
421 |
+from catalyst.support import * |
422 |
from generic_stage_target import * |
423 |
|
424 |
class snapshot_target(generic_stage_target): |
425 |
|
426 |
diff --git a/catalyst/modules/stage1_target.py b/catalyst/modules/stage1_target.py |
427 |
index 5f4ffa0..8d5a674 100644 |
428 |
--- a/catalyst/modules/stage1_target.py |
429 |
+++ b/catalyst/modules/stage1_target.py |
430 |
@@ -3,7 +3,7 @@ stage1 target |
431 |
""" |
432 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
433 |
|
434 |
-from catalyst_support import * |
435 |
+from catalyst.support import * |
436 |
from generic_stage_target import * |
437 |
|
438 |
class stage1_target(generic_stage_target): |
439 |
|
440 |
diff --git a/catalyst/modules/stage2_target.py b/catalyst/modules/stage2_target.py |
441 |
index 6083e2b..15acdee 100644 |
442 |
--- a/catalyst/modules/stage2_target.py |
443 |
+++ b/catalyst/modules/stage2_target.py |
444 |
@@ -3,7 +3,7 @@ stage2 target, builds upon previous stage1 tarball |
445 |
""" |
446 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
447 |
|
448 |
-from catalyst_support import * |
449 |
+from catalyst.support import * |
450 |
from generic_stage_target import * |
451 |
|
452 |
class stage2_target(generic_stage_target): |
453 |
|
454 |
diff --git a/catalyst/modules/stage3_target.py b/catalyst/modules/stage3_target.py |
455 |
index 4d3a008..89edd66 100644 |
456 |
--- a/catalyst/modules/stage3_target.py |
457 |
+++ b/catalyst/modules/stage3_target.py |
458 |
@@ -3,7 +3,7 @@ stage3 target, builds upon previous stage2/stage3 tarball |
459 |
""" |
460 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
461 |
|
462 |
-from catalyst_support import * |
463 |
+from catalyst.support import * |
464 |
from generic_stage_target import * |
465 |
|
466 |
class stage3_target(generic_stage_target): |
467 |
|
468 |
diff --git a/catalyst/modules/stage4_target.py b/catalyst/modules/stage4_target.py |
469 |
index ce41b2d..9168f2e 100644 |
470 |
--- a/catalyst/modules/stage4_target.py |
471 |
+++ b/catalyst/modules/stage4_target.py |
472 |
@@ -3,7 +3,7 @@ stage4 target, builds upon previous stage3/stage4 tarball |
473 |
""" |
474 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
475 |
|
476 |
-from catalyst_support import * |
477 |
+from catalyst.support import * |
478 |
from generic_stage_target import * |
479 |
|
480 |
class stage4_target(generic_stage_target): |
481 |
|
482 |
diff --git a/catalyst/modules/tinderbox_target.py b/catalyst/modules/tinderbox_target.py |
483 |
index ca55610..1d31989 100644 |
484 |
--- a/catalyst/modules/tinderbox_target.py |
485 |
+++ b/catalyst/modules/tinderbox_target.py |
486 |
@@ -3,7 +3,7 @@ Tinderbox target |
487 |
""" |
488 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
489 |
|
490 |
-from catalyst_support import * |
491 |
+from catalyst.support import * |
492 |
from generic_stage_target import * |
493 |
|
494 |
class tinderbox_target(generic_stage_target): |
495 |
|
496 |
diff --git a/catalyst/modules/catalyst_support.py b/catalyst/support.py |
497 |
similarity index 100% |
498 |
rename from catalyst/modules/catalyst_support.py |
499 |
rename to catalyst/support.py |