1 |
From: "W. Trevor King" <wking@×××××××.us> |
2 |
|
3 |
If boot/kernel/<kname>/config is not set, make _copy_kernel_config a |
4 |
no-op. |
5 |
--- |
6 |
modules/generic_stage_target.py | 27 +++++++++++---------------- |
7 |
1 file changed, 11 insertions(+), 16 deletions(-) |
8 |
|
9 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
10 |
index e741fcd..31cb025 100644 |
11 |
--- a/modules/generic_stage_target.py |
12 |
+++ b/modules/generic_stage_target.py |
13 |
@@ -1426,7 +1426,6 @@ class generic_stage_target(generic_target): |
14 |
+"build_kernel_"+kname): |
15 |
print "Resume point detected, skipping build_kernel for "+kname+" operation..." |
16 |
return |
17 |
- # TODO: make this not require a kernel config |
18 |
self._copy_kernel_config(kname=kname) |
19 |
|
20 |
""" |
21 |
@@ -1478,7 +1477,7 @@ class generic_stage_target(generic_target): |
22 |
"Runscript post-kmerge failed",env=self.env) |
23 |
|
24 |
def _copy_kernel_config(self, kname): |
25 |
- try: |
26 |
+ if "boot/kernel/"+kname+"/config" in self.settings: |
27 |
if not os.path.exists(self.settings["boot/kernel/"+kname+"/config"]): |
28 |
self.unbind() |
29 |
raise CatalystError,\ |
30 |
@@ -1486,21 +1485,17 @@ class generic_stage_target(generic_target): |
31 |
self.settings["boot/kernel/"+kname+\ |
32 |
"/config"] |
33 |
|
34 |
- except TypeError: |
35 |
- raise CatalystError,\ |
36 |
- "Required value boot/kernel/config not specified" |
37 |
+ try: |
38 |
+ cmd("cp "+self.settings["boot/kernel/"+kname+\ |
39 |
+ "/config"]+" "+\ |
40 |
+ self.settings["chroot_path"]+"/var/tmp/"+\ |
41 |
+ kname+".config",\ |
42 |
+ "Couldn't copy kernel config: "+\ |
43 |
+ self.settings["boot/kernel/"+kname+\ |
44 |
+ "/config"],env=self.env) |
45 |
|
46 |
- try: |
47 |
- cmd("cp "+self.settings["boot/kernel/"+kname+\ |
48 |
- "/config"]+" "+\ |
49 |
- self.settings["chroot_path"]+"/var/tmp/"+\ |
50 |
- kname+".config",\ |
51 |
- "Couldn't copy kernel config: "+\ |
52 |
- self.settings["boot/kernel/"+kname+\ |
53 |
- "/config"],env=self.env) |
54 |
- |
55 |
- except CatalystError: |
56 |
- self.unbind() |
57 |
+ except CatalystError: |
58 |
+ self.unbind() |
59 |
|
60 |
def _copy_initramfs_overlay(self, kname): |
61 |
if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
62 |
-- |
63 |
1.8.1.336.g94702dd |