1 |
commit: 61f4dc33005f49566f93aac352c876c093438bf9 |
2 |
Author: W. Trevor King <wking <AT> tremily <DOT> us> |
3 |
AuthorDate: Sat Feb 9 20:45:35 2013 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Feb 23 02:02:15 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=61f4dc33 |
7 |
|
8 |
generic_stage_target.py: Dedent the bulk of ._build_kernel() |
9 |
|
10 |
At the beginning of the function, we check for an autoresume point. |
11 |
If we find it, just return. This allows us to dedent the `else` block |
12 |
that had been handling the no-autoresume-found case. |
13 |
|
14 |
Reviewed-by: Matt Turner <mattst88 <AT> gmail.com> |
15 |
|
16 |
--- |
17 |
modules/generic_stage_target.py | 121 ++++++++++++++++++++------------------- |
18 |
1 files changed, 61 insertions(+), 60 deletions(-) |
19 |
|
20 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
21 |
index 2c32c00..337ab16 100644 |
22 |
--- a/modules/generic_stage_target.py |
23 |
+++ b/modules/generic_stage_target.py |
24 |
@@ -1425,74 +1425,75 @@ class generic_stage_target(generic_target): |
25 |
and os.path.exists(self.settings["autoresume_path"]\ |
26 |
+"build_kernel_"+kname): |
27 |
print "Resume point detected, skipping build_kernel for "+kname+" operation..." |
28 |
- else: # TODO: make this not require a kernel config |
29 |
- self._copy_kernel_config(kname=kname) |
30 |
+ return |
31 |
+ # TODO: make this not require a kernel config |
32 |
+ self._copy_kernel_config(kname=kname) |
33 |
|
34 |
- """ |
35 |
- If we need to pass special options to the bootloader |
36 |
- for this kernel put them into the environment |
37 |
- """ |
38 |
- if "boot/kernel/"+kname+"/kernelopts" in self.settings: |
39 |
- myopts=self.settings["boot/kernel/"+kname+\ |
40 |
- "/kernelopts"] |
41 |
+ """ |
42 |
+ If we need to pass special options to the bootloader |
43 |
+ for this kernel put them into the environment |
44 |
+ """ |
45 |
+ if "boot/kernel/"+kname+"/kernelopts" in self.settings: |
46 |
+ myopts=self.settings["boot/kernel/"+kname+\ |
47 |
+ "/kernelopts"] |
48 |
|
49 |
- if type(myopts) != types.StringType: |
50 |
- myopts = string.join(myopts) |
51 |
- self.env[kname+"_kernelopts"]=myopts |
52 |
+ if type(myopts) != types.StringType: |
53 |
+ myopts = string.join(myopts) |
54 |
+ self.env[kname+"_kernelopts"]=myopts |
55 |
|
56 |
- else: |
57 |
- self.env[kname+"_kernelopts"]="" |
58 |
+ else: |
59 |
+ self.env[kname+"_kernelopts"]="" |
60 |
|
61 |
- if "boot/kernel/"+kname+"/extraversion" not in self.settings: |
62 |
- self.settings["boot/kernel/"+kname+\ |
63 |
- "/extraversion"]="" |
64 |
+ if "boot/kernel/"+kname+"/extraversion" not in self.settings: |
65 |
+ self.settings["boot/kernel/"+kname+\ |
66 |
+ "/extraversion"]="" |
67 |
|
68 |
- self.env["clst_kextraversion"]=\ |
69 |
- self.settings["boot/kernel/"+kname+\ |
70 |
- "/extraversion"] |
71 |
- |
72 |
- if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
73 |
- if os.path.exists(self.settings["boot/kernel/"+\ |
74 |
- kname+"/initramfs_overlay"]): |
75 |
- print "Copying initramfs_overlay dir "+\ |
76 |
- self.settings["boot/kernel/"+kname+\ |
77 |
- "/initramfs_overlay"] |
78 |
- |
79 |
- cmd("mkdir -p "+\ |
80 |
- self.settings["chroot_path"]+\ |
81 |
- "/tmp/initramfs_overlay/"+\ |
82 |
- self.settings["boot/kernel/"+kname+\ |
83 |
- "/initramfs_overlay"],env=self.env) |
84 |
- |
85 |
- cmd("cp -R "+self.settings["boot/kernel/"+\ |
86 |
- kname+"/initramfs_overlay"]+"/* "+\ |
87 |
- self.settings["chroot_path"]+\ |
88 |
- "/tmp/initramfs_overlay/"+\ |
89 |
- self.settings["boot/kernel/"+kname+\ |
90 |
- "/initramfs_overlay"],env=self.env) |
91 |
- |
92 |
- """ Execute the script that builds the kernel """ |
93 |
- cmd("/bin/bash "+self.settings["controller_file"]+\ |
94 |
- " kernel "+kname,\ |
95 |
- "Runscript kernel build failed",env=self.env) |
96 |
+ self.env["clst_kextraversion"]=\ |
97 |
+ self.settings["boot/kernel/"+kname+\ |
98 |
+ "/extraversion"] |
99 |
+ |
100 |
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
101 |
+ if os.path.exists(self.settings["boot/kernel/"+\ |
102 |
+ kname+"/initramfs_overlay"]): |
103 |
+ print "Copying initramfs_overlay dir "+\ |
104 |
+ self.settings["boot/kernel/"+kname+\ |
105 |
+ "/initramfs_overlay"] |
106 |
|
107 |
- if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
108 |
- if os.path.exists(self.settings["chroot_path"]+\ |
109 |
- "/tmp/initramfs_overlay/"): |
110 |
- print "Cleaning up temporary overlay dir" |
111 |
- cmd("rm -R "+self.settings["chroot_path"]+\ |
112 |
- "/tmp/initramfs_overlay/",env=self.env) |
113 |
+ cmd("mkdir -p "+\ |
114 |
+ self.settings["chroot_path"]+\ |
115 |
+ "/tmp/initramfs_overlay/"+\ |
116 |
+ self.settings["boot/kernel/"+kname+\ |
117 |
+ "/initramfs_overlay"],env=self.env) |
118 |
|
119 |
- touch(self.settings["autoresume_path"]+\ |
120 |
- "build_kernel_"+kname) |
121 |
+ cmd("cp -R "+self.settings["boot/kernel/"+\ |
122 |
+ kname+"/initramfs_overlay"]+"/* "+\ |
123 |
+ self.settings["chroot_path"]+\ |
124 |
+ "/tmp/initramfs_overlay/"+\ |
125 |
+ self.settings["boot/kernel/"+kname+\ |
126 |
+ "/initramfs_overlay"],env=self.env) |
127 |
|
128 |
- """ |
129 |
- Execute the script that cleans up the kernel build |
130 |
- environment |
131 |
- """ |
132 |
- cmd("/bin/bash "+self.settings["controller_file"]+\ |
133 |
- " post-kmerge ", |
134 |
- "Runscript post-kmerge failed",env=self.env) |
135 |
+ """ Execute the script that builds the kernel """ |
136 |
+ cmd("/bin/bash "+self.settings["controller_file"]+\ |
137 |
+ " kernel "+kname,\ |
138 |
+ "Runscript kernel build failed",env=self.env) |
139 |
+ |
140 |
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
141 |
+ if os.path.exists(self.settings["chroot_path"]+\ |
142 |
+ "/tmp/initramfs_overlay/"): |
143 |
+ print "Cleaning up temporary overlay dir" |
144 |
+ cmd("rm -R "+self.settings["chroot_path"]+\ |
145 |
+ "/tmp/initramfs_overlay/",env=self.env) |
146 |
+ |
147 |
+ touch(self.settings["autoresume_path"]+\ |
148 |
+ "build_kernel_"+kname) |
149 |
+ |
150 |
+ """ |
151 |
+ Execute the script that cleans up the kernel build |
152 |
+ environment |
153 |
+ """ |
154 |
+ cmd("/bin/bash "+self.settings["controller_file"]+\ |
155 |
+ " post-kmerge ", |
156 |
+ "Runscript post-kmerge failed",env=self.env) |
157 |
|
158 |
def _copy_kernel_config(self, kname): |
159 |
try: |