diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2022-11-21 23:57:44 -0500 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2022-11-22 16:19:03 -0500 |
| commit | 6ad2bb1cf15a0354cff19ea935d3f3c618aeb614 (patch) | |
| tree | 43889a54a58652dd189661e8403caf3197d15992 | |
| parent | targets: Fix CHOST vs `uname -m` confusion (diff) | |
| download | catalyst-6ad2bb1c.tar.gz catalyst-6ad2bb1c.tar.bz2 catalyst-6ad2bb1c.zip | |
catalyst: WIP
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | catalyst/base/stagebase.py | 5 |
1 files 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: |