1 |
commit: 6ad2bb1cf15a0354cff19ea935d3f3c618aeb614 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 22 04:57:44 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 22 21:19:03 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6ad2bb1c |
7 |
|
8 |
catalyst: WIP |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
catalyst/base/stagebase.py | 5 +++-- |
13 |
1 file changed, 3 insertions(+), 2 deletions(-) |
14 |
|
15 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
16 |
index 732c5939..35aa82ba 100644 |
17 |
--- a/catalyst/base/stagebase.py |
18 |
+++ b/catalyst/base/stagebase.py |
19 |
@@ -108,13 +108,11 @@ class StageBase(TargetBase, ClearBase, GenBase): |
20 |
host = self.settings["chost"].split("-")[0] |
21 |
else: |
22 |
host = self.settings["subarch"] |
23 |
- self.settings["hostarch"] = host |
24 |
|
25 |
if "cbuild" in self.settings: |
26 |
build = self.settings["cbuild"].split("-")[0] |
27 |
else: |
28 |
build = platform.machine() |
29 |
- self.settings["buildarch"] = build |
30 |
|
31 |
arch_dir = normpath(self.settings['sharedir'] + '/arch/') |
32 |
|
33 |
@@ -139,6 +137,9 @@ class StageBase(TargetBase, ClearBase, GenBase): |
34 |
else: |
35 |
raise CatalystError("Unknown host machine type " + host) |
36 |
|
37 |
+ self.settings["hostarch"] = arch |
38 |
+ self.settings["buildarch"] = build |
39 |
+ |
40 |
if setarch.get('if_build', '') == platform.machine(): |
41 |
chroot = f'setarch {setarch["arch"]} chroot' |
42 |
else: |