| 1 |
commit: 27d7c7898bb0cccf6962b84058b0e2789bc314c1 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 18 03:20:41 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 23 16:19:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=27d7c789 |
| 7 |
|
| 8 |
catalyst: Deduplicate the common build_sequence steps |
| 9 |
|
| 10 |
This also provides a single location to add a function to all targets' |
| 11 |
build_sequence. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
catalyst/base/stagebase.py | 11 ++++++----- |
| 16 |
catalyst/targets/embedded.py | 3 --- |
| 17 |
catalyst/targets/livecd_stage1.py | 3 --- |
| 18 |
catalyst/targets/livecd_stage2.py | 3 --- |
| 19 |
catalyst/targets/netboot.py | 3 --- |
| 20 |
catalyst/targets/stage4.py | 3 --- |
| 21 |
6 files changed, 6 insertions(+), 20 deletions(-) |
| 22 |
|
| 23 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 24 |
index 3b8d3a6e..40b60af3 100644 |
| 25 |
--- a/catalyst/base/stagebase.py |
| 26 |
+++ b/catalyst/base/stagebase.py |
| 27 |
@@ -90,7 +90,11 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 28 |
self.setup_confdir, |
| 29 |
self.portage_overlay, |
| 30 |
] |
| 31 |
- self.build_sequence = [] |
| 32 |
+ self.build_sequence = [ |
| 33 |
+ self.bind, |
| 34 |
+ self.chroot_setup, |
| 35 |
+ self.setup_environment, |
| 36 |
+ ] |
| 37 |
self.finish_sequence = [] |
| 38 |
|
| 39 |
self.set_valid_build_kernel_vars(addlargs) |
| 40 |
@@ -497,16 +501,13 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 41 |
Or it calls the normal set_action_sequence() for the target stage. |
| 42 |
""" |
| 43 |
if "purgeonly" in self.settings["options"]: |
| 44 |
- self.build_sequence.append(self.remove_chroot) |
| 45 |
+ self.build_sequence = [self.remove_chroot] |
| 46 |
return |
| 47 |
self.set_action_sequence() |
| 48 |
|
| 49 |
def set_action_sequence(self): |
| 50 |
"""Set basic stage1, 2, 3 action sequences""" |
| 51 |
self.build_sequence.extend([ |
| 52 |
- self.bind, |
| 53 |
- self.chroot_setup, |
| 54 |
- self.setup_environment, |
| 55 |
self.run_local, |
| 56 |
self.preclean, |
| 57 |
]) |
| 58 |
|
| 59 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
| 60 |
index 83b17ad2..b677b226 100644 |
| 61 |
--- a/catalyst/targets/embedded.py |
| 62 |
+++ b/catalyst/targets/embedded.py |
| 63 |
@@ -42,9 +42,6 @@ class embedded(StageBase): |
| 64 |
|
| 65 |
def set_action_sequence(self): |
| 66 |
self.build_sequence.extend([ |
| 67 |
- self.bind, |
| 68 |
- self.chroot_setup, |
| 69 |
- self.setup_environment, |
| 70 |
self.build_kernel, |
| 71 |
self.build_packages, |
| 72 |
self.root_overlay, |
| 73 |
|
| 74 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
| 75 |
index 9fe95a00..dbfa54ed 100644 |
| 76 |
--- a/catalyst/targets/livecd_stage1.py |
| 77 |
+++ b/catalyst/targets/livecd_stage1.py |
| 78 |
@@ -24,9 +24,6 @@ class livecd_stage1(StageBase): |
| 79 |
|
| 80 |
def set_action_sequence(self): |
| 81 |
self.build_sequence.extend([ |
| 82 |
- self.bind, |
| 83 |
- self.chroot_setup, |
| 84 |
- self.setup_environment, |
| 85 |
self.build_packages, |
| 86 |
]) |
| 87 |
self.finish_sequence.extend([ |
| 88 |
|
| 89 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 90 |
index ab8f4a0e..e90e9f53 100644 |
| 91 |
--- a/catalyst/targets/livecd_stage2.py |
| 92 |
+++ b/catalyst/targets/livecd_stage2.py |
| 93 |
@@ -87,9 +87,6 @@ class livecd_stage2(StageBase): |
| 94 |
|
| 95 |
def set_action_sequence(self): |
| 96 |
self.build_sequence.extend([ |
| 97 |
- self.bind, |
| 98 |
- self.chroot_setup, |
| 99 |
- self.setup_environment, |
| 100 |
self.run_local, |
| 101 |
self.build_kernel |
| 102 |
]) |
| 103 |
|
| 104 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
| 105 |
index cb5e7ae4..a2a9fcb3 100644 |
| 106 |
--- a/catalyst/targets/netboot.py |
| 107 |
+++ b/catalyst/targets/netboot.py |
| 108 |
@@ -159,9 +159,6 @@ class netboot(StageBase): |
| 109 |
|
| 110 |
def set_action_sequence(self): |
| 111 |
self.build_sequence.extend([ |
| 112 |
- self.bind, |
| 113 |
- self.chroot_setup, |
| 114 |
- self.setup_environment, |
| 115 |
self.build_packages, |
| 116 |
self.root_overlay, |
| 117 |
self.copy_files_to_image, |
| 118 |
|
| 119 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
| 120 |
index 9e53f070..f8383f75 100644 |
| 121 |
--- a/catalyst/targets/stage4.py |
| 122 |
+++ b/catalyst/targets/stage4.py |
| 123 |
@@ -40,9 +40,6 @@ class stage4(StageBase): |
| 124 |
|
| 125 |
def set_action_sequence(self): |
| 126 |
self.build_sequence.extend([ |
| 127 |
- self.bind, |
| 128 |
- self.chroot_setup, |
| 129 |
- self.setup_environment, |
| 130 |
self.build_packages, |
| 131 |
self.build_kernel, |
| 132 |
self.bootloader, |
Archives