| 1 |
commit: a1c561ae8fb636e82a9c93863a74c1b423966527 |
| 2 |
Author: W. Trevor King <wking <AT> tremily <DOT> us> |
| 3 |
AuthorDate: Sat Feb 9 20:45:36 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=a1c561ae |
| 7 |
|
| 8 |
generic_stage_target: Split ._copy_initramfs_overlay() from ._build_kernel() |
| 9 |
|
| 10 |
_copy_initramfs_overlay() is long enough that it makes reading |
| 11 |
_build_kernel() difficult. |
| 12 |
|
| 13 |
Reviewed-by: Matt Turner <mattst88 <AT> gmail.com> |
| 14 |
|
| 15 |
--- |
| 16 |
modules/generic_stage_target.py | 41 ++++++++++++++++++++------------------ |
| 17 |
1 files changed, 22 insertions(+), 19 deletions(-) |
| 18 |
|
| 19 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 20 |
index 337ab16..e741fcd 100644 |
| 21 |
--- a/modules/generic_stage_target.py |
| 22 |
+++ b/modules/generic_stage_target.py |
| 23 |
@@ -1452,25 +1452,7 @@ class generic_stage_target(generic_target): |
| 24 |
self.settings["boot/kernel/"+kname+\ |
| 25 |
"/extraversion"] |
| 26 |
|
| 27 |
- if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
| 28 |
- if os.path.exists(self.settings["boot/kernel/"+\ |
| 29 |
- kname+"/initramfs_overlay"]): |
| 30 |
- print "Copying initramfs_overlay dir "+\ |
| 31 |
- self.settings["boot/kernel/"+kname+\ |
| 32 |
- "/initramfs_overlay"] |
| 33 |
- |
| 34 |
- cmd("mkdir -p "+\ |
| 35 |
- self.settings["chroot_path"]+\ |
| 36 |
- "/tmp/initramfs_overlay/"+\ |
| 37 |
- self.settings["boot/kernel/"+kname+\ |
| 38 |
- "/initramfs_overlay"],env=self.env) |
| 39 |
- |
| 40 |
- cmd("cp -R "+self.settings["boot/kernel/"+\ |
| 41 |
- kname+"/initramfs_overlay"]+"/* "+\ |
| 42 |
- self.settings["chroot_path"]+\ |
| 43 |
- "/tmp/initramfs_overlay/"+\ |
| 44 |
- self.settings["boot/kernel/"+kname+\ |
| 45 |
- "/initramfs_overlay"],env=self.env) |
| 46 |
+ self._copy_initramfs_overlay(kname=kname) |
| 47 |
|
| 48 |
""" Execute the script that builds the kernel """ |
| 49 |
cmd("/bin/bash "+self.settings["controller_file"]+\ |
| 50 |
@@ -1520,6 +1502,27 @@ class generic_stage_target(generic_target): |
| 51 |
except CatalystError: |
| 52 |
self.unbind() |
| 53 |
|
| 54 |
+ def _copy_initramfs_overlay(self, kname): |
| 55 |
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
| 56 |
+ if os.path.exists(self.settings["boot/kernel/"+\ |
| 57 |
+ kname+"/initramfs_overlay"]): |
| 58 |
+ print "Copying initramfs_overlay dir "+\ |
| 59 |
+ self.settings["boot/kernel/"+kname+\ |
| 60 |
+ "/initramfs_overlay"] |
| 61 |
+ |
| 62 |
+ cmd("mkdir -p "+\ |
| 63 |
+ self.settings["chroot_path"]+\ |
| 64 |
+ "/tmp/initramfs_overlay/"+\ |
| 65 |
+ self.settings["boot/kernel/"+kname+\ |
| 66 |
+ "/initramfs_overlay"],env=self.env) |
| 67 |
+ |
| 68 |
+ cmd("cp -R "+self.settings["boot/kernel/"+\ |
| 69 |
+ kname+"/initramfs_overlay"]+"/* "+\ |
| 70 |
+ self.settings["chroot_path"]+\ |
| 71 |
+ "/tmp/initramfs_overlay/"+\ |
| 72 |
+ self.settings["boot/kernel/"+kname+\ |
| 73 |
+ "/initramfs_overlay"],env=self.env) |
| 74 |
+ |
| 75 |
def bootloader(self): |
| 76 |
if "AUTORESUME" in self.settings \ |
| 77 |
and os.path.exists(self.settings["autoresume_path"]+"bootloader"): |
Archives