diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2022-11-21 22:26:59 -0500 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2022-11-22 16:19:03 -0500 |
| commit | aa52470e86ebd0578c379813a9144611c97431a8 (patch) | |
| tree | b7969a356378c8380a4c2c1917a6ad2ab871162a /catalyst | |
| parent | catalyst: Remove stray space (diff) | |
| download | catalyst-aa52470e86ebd0578c379813a9144611c97431a8.tar.gz catalyst-aa52470e86ebd0578c379813a9144611c97431a8.tar.bz2 catalyst-aa52470e86ebd0578c379813a9144611c97431a8.zip | |
catalyst: Use correct arch setting for setarch testing
Previously we were testing against the 'host' or subarchitecture (e.g.
i486) instead of the architecture (e.g. x86). This manifests on x86
builds on x86_64; on ppc on ppc64 and sparc on sparc64 the arch and
subarch values happen to line up.
Fixes: cd58b37b ("catalyst: Access setarch data correctly")
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'catalyst')
| -rw-r--r-- | catalyst/base/stagebase.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 5a3bd375..732c5939 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -129,7 +129,7 @@ class StageBase(TargetBase, ClearBase, GenBase): # Search for a subarchitecture in each arch in the arch_config for arch in [x for x in arch_config if x.startswith(name) and host in arch_config[x]]: self.settings.update(arch_config[arch][host]) - setarch = arch_config.get('setarch', {}).get(host, {}) + setarch = arch_config.get('setarch', {}).get(arch, {}) break else: # Didn't find a matching subarchitecture, keep searching |