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