From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0992158020 for ; Tue, 22 Nov 2022 03:36:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0BF8E08C8; Tue, 22 Nov 2022 03:36:01 +0000 (UTC) Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCC4EE08C8 for ; Tue, 22 Nov 2022 03:36:01 +0000 (UTC) Received: by mail-qv1-f46.google.com with SMTP id h10so9341704qvq.7 for ; Mon, 21 Nov 2022 19:36:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ankLheYvrsdkW+5EvFJECR5oEMEdanOQjpzxAyBYsG4=; b=YW9vMzwvBctBdaN3JubJEdfiMDnjtGDZRPa4/DGWkv5FSYHHTdAC2/aRDiKJoqjNyH 4dte05DD+Y3pNJ+SKWQ7E0o49oQlYV8YS/KPrUHpCeps04IdFLNR6ZpDSYNK6Z8sxllk YLVIX71IFvgfy88Y9B5N1yrGT/OSRT4fqjlVcnsCNBo0y//Re7yYm/JhoEn3jJ6Jl4ut sHBT6jmdihBAISj6X7e/lgXNX3tKrzk5hSmcV6xbe3h2w9Bci2O4qp187tKEyB868LyQ /N3gen/a93HkJWIklGKv7sC12MRBCJFmLMfnFnVMVwDr4SbGjKuOlLHGJHlKbzGAnpjx 28Yg== X-Gm-Message-State: ANoB5pmD4FwRgzFklRc9cc7Sh6GoksPXmA1lmOYk8W0IjBwXfjGtE/yD PS7mkuwZ3s+9wF6XXeBkdJRhZQ1q0PA= X-Google-Smtp-Source: AA0mqf4vdGQ+NEAk59H6YF543XQhmgmZKnEPsKkonKuUP9YDDweLGOlAkyPPKHDHSKXbsV1BB+Wj6w== X-Received: by 2002:a05:6214:1e2:b0:4c6:8f31:2dea with SMTP id c2-20020a05621401e200b004c68f312deamr3837021qvu.127.1669088160800; Mon, 21 Nov 2022 19:36:00 -0800 (PST) Received: from localhost ([162.208.5.36]) by smtp.gmail.com with ESMTPSA id de13-20020a05620a370d00b006e99290e83fsm9540419qkb.107.2022.11.21.19.35.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 19:36:00 -0800 (PST) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH] catalyst: Use correct arch setting for setarch testing Date: Mon, 21 Nov 2022 22:35:49 -0500 Message-Id: <20221122033549.292326-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.37.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 3bc6e271-04db-4855-bffa-fac338d1bd81 X-Archives-Hash: 20027c251df22b42246ed9ad2488a642 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 --- catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.37.4