1 |
Will need to be applied manually to master, but should be done if you |
2 |
intend to release another bugfix release in the 2.x series. At least use |
3 |
the files changed to fix the files in current master. I'm not sure if |
4 |
this one would easily apply to master. |
5 |
|
6 |
|
7 |
============================================================== |
8 |
|
9 |
|
10 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
11 |
index a583028..37cdd40 100644 |
12 |
@@ -50,7 +50,7 @@ class livecd_stage2(StageBase): |
13 |
print_traceback=True) |
14 |
|
15 |
def set_spec_prefix(self): |
16 |
- self.settings["spec_prefix"]="livecd" |
17 |
+ self.settings["spec_prefix"]="livecd" |
18 |
|
19 |
def set_target_path(self): |
20 |
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") |
21 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
22 |
index 7ae1d75..de8dc85 100644 |
23 |
@@ -122,13 +122,12 @@ class netboot(StageBase): |
24 |
self.unbind() |
25 |
raise CatalystError("netboot build aborting due to error.", |
26 |
print_traceback=True) |
27 |
- |
28 |
# end |
29 |
print "netboot: build finished !" |
30 |
|
31 |
def set_action_sequence(self): |
32 |
- self.settings["action_sequence"]=["unpack","unpack_snapshot", |
33 |
- "config_profile_link","setup_confdir","bind","chroot_setup",\ |
34 |
- "setup_environment","build_packages","build_busybox",\ |
35 |
- "build_kernel","copy_files_to_image",\ |
36 |
- "clean","create_netboot_files","unbind","clear_autoresume"] |
37 |
+ self.settings["action_sequence"]=["unpack","unpack_snapshot", |
38 |
+ "config_profile_link","setup_confdir","bind","chroot_setup",\ |
39 |
+ "setup_environment","build_packages","build_busybox",\ |
40 |
+ "build_kernel","copy_files_to_image",\ |
41 |
+ "clean","create_netboot_files","unbind","clear_autoresume"] |
42 |
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py |
43 |
index e8e7d22..f9b2a7b 100644 |
44 |
@@ -165,8 +165,8 @@ class netboot2(StageBase): |
45 |
touch(self.settings["autoresume_path"]+"empty") |
46 |
|
47 |
def set_action_sequence(self): |
48 |
- self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", |
49 |
- "setup_confdir","portage_overlay","bind","chroot_setup",\ |
50 |
- "setup_environment","build_packages","root_overlay",\ |
51 |
- "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ |
52 |
- "remove","empty","unbind","clean","clear_autoresume"] |
53 |
+ self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", |
54 |
+ "setup_confdir","portage_overlay","bind","chroot_setup",\ |
55 |
+ "setup_environment","build_packages","root_overlay",\ |
56 |
+ "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ |
57 |
+ "remove","empty","unbind","clean","clear_autoresume"] |
58 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
59 |
index f959c4a..310344c 100644 |
60 |
@@ -15,10 +15,10 @@ class stage4(StageBase): |
61 |
self.required_values=["stage4/packages"] |
62 |
self.valid_values=self.required_values[:] |
63 |
self.valid_values.extend(["stage4/use","boot/kernel",\ |
64 |
- "stage4/root_overlay","stage4/fsscript",\ |
65 |
- "stage4/gk_mainargs","splash_theme",\ |
66 |
- "portage_overlay","stage4/rcadd","stage4/rcdel",\ |
67 |
- "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) |
68 |
+ "stage4/root_overlay","stage4/fsscript",\ |
69 |
+ "stage4/gk_mainargs","splash_theme",\ |
70 |
+ "portage_overlay","stage4/rcadd","stage4/rcdel",\ |
71 |
+ "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) |
72 |
StageBase.__init__(self,spec,addlargs) |
73 |
|
74 |
def set_cleanables(self): |
75 |
@@ -26,11 +26,11 @@ class stage4(StageBase): |
76 |
|
77 |
def set_action_sequence(self): |
78 |
self.settings["action_sequence"]=["unpack","unpack_snapshot",\ |
79 |
- "config_profile_link","setup_confdir","portage_overlay",\ |
80 |
- "bind","chroot_setup","setup_environment","build_packages",\ |
81 |
- "build_kernel","bootloader","root_overlay","fsscript",\ |
82 |
- "preclean","rcupdate","unmerge","unbind","remove","empty",\ |
83 |
- "clean"] |
84 |
+ "config_profile_link","setup_confdir","portage_overlay",\ |
85 |
+ "bind","chroot_setup","setup_environment","build_packages",\ |
86 |
+ "build_kernel","bootloader","root_overlay","fsscript",\ |
87 |
+ "preclean","rcupdate","unmerge","unbind","remove","empty",\ |
88 |
+ "clean"] |
89 |
|
90 |
# if "TARBALL" in self.settings or \ |
91 |
# "fetch" not in self.settings['options']: |
92 |
diff --git a/catalyst/targets/tinderbox.py b/catalyst/targets/tinderbox.py |
93 |
index 1c91aac..2cebaa8 100644 |
94 |
@@ -26,7 +26,7 @@ class tinderbox(StageBase): |
95 |
# example call: "grp.sh run xmms vim sys-apps/gleep" |
96 |
try: |
97 |
if os.path.exists(self.settings["controller_file"]): |
98 |
- cmd(self.settings["controller_file"]+" run "+\ |
99 |
+ cmd(self.settings["controller_file"]+" run "+\ |
100 |
list_bashify(self.settings["tinderbox/packages"]),"run script failed.",env=self.env) |
101 |
|
102 |
except CatalystError: |
103 |
@@ -35,12 +35,12 @@ class tinderbox(StageBase): |
104 |
print_traceback=True) |
105 |
|
106 |
def set_cleanables(self): |
107 |
- self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*", |
108 |
+ self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*", |
109 |
self.settings['portdir']] |
110 |
|
111 |
def set_action_sequence(self): |
112 |
#Default action sequence for run method |
113 |
self.settings["action_sequence"]=["unpack","unpack_snapshot",\ |
114 |
- "config_profile_link","setup_confdir","bind","chroot_setup",\ |
115 |
- "setup_environment","run_local","preclean","unbind","clean",\ |
116 |
- "clear_autoresume"] |
117 |
+ "config_profile_link","setup_confdir","bind","chroot_setup",\ |
118 |
+ "setup_environment","run_local","preclean","unbind","clean",\ |
119 |
+ "clear_autoresume"] |
120 |
|
121 |
|
122 |
-- |
123 |
Brian Dolbec <dolsen@g.o> |