| 1 |
commit: b55d6967fcbf9b2d10c324d4eb523f28f0829909 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 15:14:11 2018 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 19:08:48 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b55d6967 |
| 7 |
|
| 8 |
targets/livecd_stage2.py: Add "clean" action |
| 9 |
|
| 10 |
Add clean to clear out the tree used to build with. |
| 11 |
Seems "empty" used to be hard coded to clean it out. |
| 12 |
|
| 13 |
catalyst/targets/livecd_stage2.py | 36 ++++++++++++++++++++++++++++-------- |
| 14 |
1 file changed, 28 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 17 |
index a3b5e5e6..63f77ac3 100644 |
| 18 |
--- a/catalyst/targets/livecd_stage2.py |
| 19 |
+++ b/catalyst/targets/livecd_stage2.py |
| 20 |
@@ -68,13 +68,33 @@ class livecd_stage2(StageBase): |
| 21 |
print_traceback=True) |
| 22 |
|
| 23 |
def set_action_sequence(self): |
| 24 |
- self.settings["action_sequence"]=["unpack","unpack_snapshot",\ |
| 25 |
- "config_profile_link","setup_confdir","portage_overlay",\ |
| 26 |
- "bind","chroot_setup","setup_environment","run_local",\ |
| 27 |
- "build_kernel"] |
| 28 |
+ self.settings["action_sequence"]=[ |
| 29 |
+ "unpack", |
| 30 |
+ "unpack_snapshot", |
| 31 |
+ "config_profile_link", |
| 32 |
+ "setup_confdir", |
| 33 |
+ "portage_overlay", |
| 34 |
+ "bind", |
| 35 |
+ "chroot_setup", |
| 36 |
+ "setup_environment", |
| 37 |
+ "run_local", |
| 38 |
+ "build_kernel" |
| 39 |
+ ] |
| 40 |
if "fetch" not in self.settings["options"]: |
| 41 |
- self.settings["action_sequence"] += ["bootloader","preclean",\ |
| 42 |
- "livecd_update","root_overlay","fsscript","rcupdate","unmerge",\ |
| 43 |
- "unbind","remove","empty","target_setup",\ |
| 44 |
- "setup_overlay","create_iso"] |
| 45 |
+ self.settings["action_sequence"] += [ |
| 46 |
+ "bootloader", |
| 47 |
+ "preclean", |
| 48 |
+ "livecd_update", |
| 49 |
+ "root_overlay", |
| 50 |
+ "fsscript", |
| 51 |
+ "rcupdate", |
| 52 |
+ "unmerge", |
| 53 |
+ "unbind", |
| 54 |
+ "remove", |
| 55 |
+ "empty", |
| 56 |
+ "clean", |
| 57 |
+ "target_setup", |
| 58 |
+ "setup_overlay", |
| 59 |
+ "create_iso" |
| 60 |
+ ] |
| 61 |
self.settings["action_sequence"].append("clear_autoresume") |
Archives