aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2021-01-17 22:20:41 -0500
committerMatt Turner <mattst88@gentoo.org>2021-01-23 11:19:07 -0500
commit27d7c7898bb0cccf6962b84058b0e2789bc314c1 (patch)
tree9949a13e5787ba2ba55f9647d2c4373caacdb9f8 /catalyst/base
parentcatalyst: Deduplicate prepare_sequence assignments (diff)
downloadcatalyst-27d7c7898bb0cccf6962b84058b0e2789bc314c1.tar.gz
catalyst-27d7c7898bb0cccf6962b84058b0e2789bc314c1.tar.bz2
catalyst-27d7c7898bb0cccf6962b84058b0e2789bc314c1.zip
catalyst: Deduplicate the common build_sequence steps
This also provides a single location to add a function to all targets' build_sequence. Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'catalyst/base')
-rw-r--r--catalyst/base/stagebase.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 3b8d3a6e..40b60af3 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -90,7 +90,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.setup_confdir,
self.portage_overlay,
]
- self.build_sequence = []
+ self.build_sequence = [
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ ]
self.finish_sequence = []
self.set_valid_build_kernel_vars(addlargs)
@@ -497,16 +501,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
Or it calls the normal set_action_sequence() for the target stage.
"""
if "purgeonly" in self.settings["options"]:
- self.build_sequence.append(self.remove_chroot)
+ self.build_sequence = [self.remove_chroot]
return
self.set_action_sequence()
def set_action_sequence(self):
"""Set basic stage1, 2, 3 action sequences"""
self.build_sequence.extend([
- self.bind,
- self.chroot_setup,
- self.setup_environment,
self.run_local,
self.preclean,
])