From: "W. Trevor King" <[email protected]>
At the beginning of the function, we check for an autoresume point.
If we find it, just return. This allows us to dedent the `else` block
that had been handling the no-autoresume-found case.
---
modules/generic_stage_target.py | 121 ++++++++++++++++++++--------------------
1 file changed, 61 insertions(+), 60 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 2c32c00..337ab16 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1425,74 +1425,75 @@ class generic_stage_target(generic_target):
and os.path.exists(self.settings["autoresume_path"]\
+"build_kernel_"+kname):
print "Resume point detected, skipping build_kernel for
"+kname+" operation..."
- else: # TODO: make this not require a kernel config
- self._copy_kernel_config(kname=kname)
+ return
+ # TODO: make this not require a kernel config
+ self._copy_kernel_config(kname=kname)
- """
- If we need to pass special options to the bootloader
- for this kernel put them into the environment
- """
- if "boot/kernel/"+kname+"/kernelopts" in self.settings:
- myopts=self.settings["boot/kernel/"+kname+\
- "/kernelopts"]
+ """
+ If we need to pass special options to the bootloader
+ for this kernel put them into the environment
+ """
+ if "boot/kernel/"+kname+"/kernelopts" in self.settings:
+ myopts=self.settings["boot/kernel/"+kname+\
+ "/kernelopts"]
- if type(myopts) != types.StringType:
- myopts = string.join(myopts)
- self.env[kname+"_kernelopts"]=myopts
+ if type(myopts) != types.StringType:
+ myopts = string.join(myopts)
+ self.env[kname+"_kernelopts"]=myopts
- else:
- self.env[kname+"_kernelopts"]=""
+ else:
+ self.env[kname+"_kernelopts"]=""
- if "boot/kernel/"+kname+"/extraversion" not in
self.settings:
- self.settings["boot/kernel/"+kname+\
- "/extraversion"]=""
+ if "boot/kernel/"+kname+"/extraversion" not in self.settings:
+ self.settings["boot/kernel/"+kname+\
+ "/extraversion"]=""
- self.env["clst_kextraversion"]=\
- self.settings["boot/kernel/"+kname+\
- "/extraversion"]
-
- if "boot/kernel/"+kname+"/initramfs_overlay" in
self.settings:
- if os.path.exists(self.settings["boot/kernel/"+\
- kname+"/initramfs_overlay"]):
- print "Copying initramfs_overlay dir "+\
-
self.settings["boot/kernel/"+kname+\
- "/initramfs_overlay"]
-
- cmd("mkdir -p "+\
- self.settings["chroot_path"]+\
- "/tmp/initramfs_overlay/"+\
-
self.settings["boot/kernel/"+kname+\
-
"/initramfs_overlay"],env=self.env)
-
- cmd("cp -R
"+self.settings["boot/kernel/"+\
- kname+"/initramfs_overlay"]+"/*
"+\
- self.settings["chroot_path"]+\
- "/tmp/initramfs_overlay/"+\
-
self.settings["boot/kernel/"+kname+\
-
"/initramfs_overlay"],env=self.env)
-
- """ Execute the script that builds the kernel """
- cmd("/bin/bash "+self.settings["controller_file"]+\
- " kernel "+kname,\
- "Runscript kernel build failed",env=self.env)
+ self.env["clst_kextraversion"]=\
+ self.settings["boot/kernel/"+kname+\
+ "/extraversion"]
+
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings:
+ if os.path.exists(self.settings["boot/kernel/"+\
+ kname+"/initramfs_overlay"]):
+ print "Copying initramfs_overlay dir "+\
+ self.settings["boot/kernel/"+kname+\
+ "/initramfs_overlay"]
- if "boot/kernel/"+kname+"/initramfs_overlay" in
self.settings:
- if os.path.exists(self.settings["chroot_path"]+\
- "/tmp/initramfs_overlay/"):
- print "Cleaning up temporary overlay
dir"
- cmd("rm -R
"+self.settings["chroot_path"]+\
-
"/tmp/initramfs_overlay/",env=self.env)
+ cmd("mkdir -p "+\
+ self.settings["chroot_path"]+\
+ "/tmp/initramfs_overlay/"+\
+ self.settings["boot/kernel/"+kname+\
+ "/initramfs_overlay"],env=self.env)
- touch(self.settings["autoresume_path"]+\
- "build_kernel_"+kname)
+ cmd("cp -R "+self.settings["boot/kernel/"+\
+ kname+"/initramfs_overlay"]+"/* "+\
+ self.settings["chroot_path"]+\
+ "/tmp/initramfs_overlay/"+\
+ self.settings["boot/kernel/"+kname+\
+ "/initramfs_overlay"],env=self.env)
- """
- Execute the script that cleans up the kernel build
- environment
- """
- cmd("/bin/bash "+self.settings["controller_file"]+\
- " post-kmerge ",
- "Runscript post-kmerge failed",env=self.env)
+ """ Execute the script that builds the kernel """
+ cmd("/bin/bash "+self.settings["controller_file"]+\
+ " kernel "+kname,\
+ "Runscript kernel build failed",env=self.env)
+
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings:
+ if os.path.exists(self.settings["chroot_path"]+\
+ "/tmp/initramfs_overlay/"):
+ print "Cleaning up temporary overlay dir"
+ cmd("rm -R "+self.settings["chroot_path"]+\
+ "/tmp/initramfs_overlay/",env=self.env)
+
+ touch(self.settings["autoresume_path"]+\
+ "build_kernel_"+kname)
+
+ """
+ Execute the script that cleans up the kernel build
+ environment
+ """
+ cmd("/bin/bash "+self.settings["controller_file"]+\
+ " post-kmerge ",
+ "Runscript post-kmerge failed",env=self.env)
def _copy_kernel_config(self, kname):
try:
--
1.8.1.336.g94702dd
