commit: 3e3c257490c4d6cb9d1297f99cc004bfa0bf8621
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 04:57:44 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 04:57:59 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3e3c2574
catalyst: WIP
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 732c5939..35aa82ba 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -108,13 +108,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
host = self.settings["chost"].split("-")[0]
else:
host = self.settings["subarch"]
- self.settings["hostarch"] = host
if "cbuild" in self.settings:
build = self.settings["cbuild"].split("-")[0]
else:
build = platform.machine()
- self.settings["buildarch"] = build
arch_dir = normpath(self.settings['sharedir'] + '/arch/')
@@ -139,6 +137,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
raise CatalystError("Unknown host machine type " + host)
+ self.settings["hostarch"] = arch
+ self.settings["buildarch"] = build
+
if setarch.get('if_build', '') == platform.machine():
chroot = f'setarch {setarch["arch"]} chroot'
else: