1 |
commit: aa52470e86ebd0578c379813a9144611c97431a8 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 22 03:26:59 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=aa52470e |
7 |
|
8 |
catalyst: Use correct arch setting for setarch testing |
9 |
|
10 |
Previously we were testing against the 'host' or subarchitecture (e.g. |
11 |
i486) instead of the architecture (e.g. x86). This manifests on x86 |
12 |
builds on x86_64; on ppc on ppc64 and sparc on sparc64 the arch and |
13 |
subarch values happen to line up. |
14 |
|
15 |
Fixes: cd58b37b ("catalyst: Access setarch data correctly") |
16 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
17 |
|
18 |
catalyst/base/stagebase.py | 2 +- |
19 |
1 file changed, 1 insertion(+), 1 deletion(-) |
20 |
|
21 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
22 |
index 5a3bd375..732c5939 100644 |
23 |
--- a/catalyst/base/stagebase.py |
24 |
+++ b/catalyst/base/stagebase.py |
25 |
@@ -129,7 +129,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
26 |
# Search for a subarchitecture in each arch in the arch_config |
27 |
for arch in [x for x in arch_config if x.startswith(name) and host in arch_config[x]]: |
28 |
self.settings.update(arch_config[arch][host]) |
29 |
- setarch = arch_config.get('setarch', {}).get(host, {}) |
30 |
+ setarch = arch_config.get('setarch', {}).get(arch, {}) |
31 |
break |
32 |
else: |
33 |
# Didn't find a matching subarchitecture, keep searching |