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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CC0F138350 for ; Mon, 13 Apr 2020 20:36:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3909E0C9E; Mon, 13 Apr 2020 20:36:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80609E0C9E for ; Mon, 13 Apr 2020 20:36:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3AF134F0D1 for ; Mon, 13 Apr 2020 20:36:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB1491DD for ; Mon, 13 Apr 2020 20:36:02 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586810135.af046b2ae52d510496c8896c3750c3dae3640b71.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: af046b2ae52d510496c8896c3750c3dae3640b71 X-VCS-Branch: master Date: Mon, 13 Apr 2020 20:36:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e6c47555-3326-4fd3-a4b3-225b2d9c1825 X-Archives-Hash: d108eedeac85ec791b4a3d9642b59813 commit: af046b2ae52d510496c8896c3750c3dae3640b71 Author: Matt Turner gentoo org> AuthorDate: Sun Apr 12 01:01:31 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Apr 13 20:35:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=af046b2a catalyst: Use platform.machine() instead of uname Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 683e5989..210527a9 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1,6 +1,7 @@ import os import imp +import platform import shutil import sys @@ -131,7 +132,7 @@ class StageBase(TargetBase, ClearBase, GenBase): if "cbuild" in self.settings: buildmachine = self.settings["cbuild"].split("-")[0] else: - buildmachine = os.uname()[4] + buildmachine = platform.machine() if buildmachine not in machinemap: raise CatalystError("Unknown build machine type " + buildmachine) self.settings["buildarch"] = machinemap[buildmachine]