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