This also provides a single location to add a function to all targets'
build_sequence.
Signed-off-by: Matt Turner <matts...@gentoo.org>
---
catalyst/base/stagebase.py | 11 ++++++-----
catalyst/targets/embedded.py | 3 ---
catalyst/targets/livecd_stage1.py | 3 ---
catalyst/targets/livecd_stage2.py | 3 ---
catalyst/targets/netboot.py | 3 ---
catalyst/targets/stage4.py | 3 ---
6 files changed, 6 insertions(+), 20 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,
])
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 83b17ad2..b677b226 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -42,9 +42,6 @@ class embedded(StageBase):
def set_action_sequence(self):
self.build_sequence.extend([
- self.bind,
- self.chroot_setup,
- self.setup_environment,
self.build_kernel,
self.build_packages,
self.root_overlay,
diff --git a/catalyst/targets/livecd_stage1.py
b/catalyst/targets/livecd_stage1.py
index 9fe95a00..dbfa54ed 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -24,9 +24,6 @@ class livecd_stage1(StageBase):
def set_action_sequence(self):
self.build_sequence.extend([
- self.bind,
- self.chroot_setup,
- self.setup_environment,
self.build_packages,
])
self.finish_sequence.extend([
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index ab8f4a0e..e90e9f53 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -87,9 +87,6 @@ class livecd_stage2(StageBase):
def set_action_sequence(self):
self.build_sequence.extend([
- self.bind,
- self.chroot_setup,
- self.setup_environment,
self.run_local,
self.build_kernel
])
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index cb5e7ae4..a2a9fcb3 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -159,9 +159,6 @@ class netboot(StageBase):
def set_action_sequence(self):
self.build_sequence.extend([
- self.bind,
- self.chroot_setup,
- self.setup_environment,
self.build_packages,
self.root_overlay,
self.copy_files_to_image,
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 9e53f070..f8383f75 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -40,9 +40,6 @@ class stage4(StageBase):
def set_action_sequence(self):
self.build_sequence.extend([
- self.bind,
- self.chroot_setup,
- self.setup_environment,
self.build_packages,
self.build_kernel,
self.bootloader,
--
2.26.2
