From f3b1647b1e49472803e4dac9f01941f5c9b907db Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 21 Nov 2022 23:57:44 -0500 Subject: catalyst: WIP Signed-off-by: Matt Turner --- 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: -- cgit v1.2.3-65-gdbad