From nobody Sat Nov 29 10:46:39 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764319586; cv=none; d=zohomail.com; s=zohoarc; b=hCAMeuTQhHV7pli77coywfffZMtr2tohms6cd+g4thYiHa2E6ncWNgeYr9McaVjgG9ucCdfxSh0Qd8VM/I9KmL6wg5ea8Z62k1lMwdZKPuy72QMDfUISvRE+xXdVRf1Etx9RzdO0w93cqT0Im7ltqHGoas6qaJO/acB5HpVJu0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764319586; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9zo/Bq9TUjLyhpqSX/zXVyODLtm8ZhsvlCvCSPbQI48=; b=Pnqvlk2V9mnXNdaOy5RrPS0D13wjWeASwwTWBd1VaZN0VpNCrab2kVdD78Qfw1lGS0Qxm4pA0+UFab2yNGDK1yYzvoov9H3zZUGtyHKSiuqABwhSVTxfHYBciL8vEon18UL2zAwkphoUZstVfG9CGi6j1lXY0xNlexu26dh6Gv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764319586676341.1465873674597; Fri, 28 Nov 2025 00:46:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOu71-0006hx-Uy; Fri, 28 Nov 2025 03:45:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOu6j-0006d9-8I for qemu-devel@nongnu.org; Fri, 28 Nov 2025 03:45:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOu6f-0000Q6-So for qemu-devel@nongnu.org; Fri, 28 Nov 2025 03:45:36 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-480-RKuTCCLVNgGFzel15JyetA-1; Fri, 28 Nov 2025 03:45:31 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5C11918002C3; Fri, 28 Nov 2025 08:45:30 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.33.236]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C5FAE30001A4; Fri, 28 Nov 2025 08:45:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4DDBB1800798; Fri, 28 Nov 2025 09:45:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764319532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9zo/Bq9TUjLyhpqSX/zXVyODLtm8ZhsvlCvCSPbQI48=; b=NX8KN4piN9VX07KPLAdXXlVvGHpn4qhlTeujkaRFnPzIVeWe6nuo/tSxRXN4JuuGZocmuR RcxLKAL+TPtp+g/XKoZ4+zvwlk9mfi3cGiCrGLE1oC9k061/gN2piX/Uqle0wUrdQnwl8k fhAEDIl81L8/iZxD90obN+CNJqE2nMQ= X-MC-Unique: RKuTCCLVNgGFzel15JyetA-1 X-Mimecast-MFC-AGG-ID: RKuTCCLVNgGFzel15JyetA_1764319530 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Gerd Hoffmann , Igor Mammedov , Ani Sinha Subject: [PATCH v2 2/9] edk2: update build script Date: Fri, 28 Nov 2025 09:45:09 +0100 Message-ID: <20251128084524.363989-3-kraxel@redhat.com> In-Reply-To: <20251128084524.363989-1-kraxel@redhat.com> References: <20251128084524.363989-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1764319587487019200 Content-Type: text/plain; charset="utf-8" sync with https://gitlab.com/kraxel/edk2-build-config/ Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- roms/edk2-build.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/roms/edk2-build.py b/roms/edk2-build.py index e564765aaa71..c4bfbae4cffb 100755 --- a/roms/edk2-build.py +++ b/roms/edk2-build.py @@ -51,7 +51,17 @@ def get_toolchain(cfg, build): return cfg[build]['tool'] if cfg.has_option('global', 'tool'): return cfg['global']['tool'] - return 'GCC5' + return 'GCC' + +def get_hostarch(): + mach =3D os.uname().machine + if mach =3D=3D 'x86_64': + return 'X64' + if mach =3D=3D 'aarch64': + return 'AARCH64' + if mach =3D=3D 'riscv64': + return 'RISCV64' + return 'UNKNOWN' =20 def get_version(cfg, silent =3D False): coredir =3D get_coredir(cfg) @@ -137,7 +147,7 @@ def build_run(cmdline, name, section, silent =3D False,= nologs =3D False): print(f'### exit code: {result.returncode}') else: secs =3D int(time.time() - start) - print(f'### OK ({int(secs/60)}:{secs%60:02d})') + print(f'### OK ({int(secs)}sec)') else: print(cmdline, flush =3D True) result =3D subprocess.run(cmdline, check =3D False) @@ -191,7 +201,10 @@ def build_one(cfg, build, jobs =3D None, silent =3D Fa= lse, nologs =3D False): if jobs: cmdline +=3D [ '-n', jobs ] for arch in b['arch'].split(): - cmdline +=3D [ '-a', arch ] + if arch =3D=3D 'HOST': + cmdline +=3D [ '-a', get_hostarch() ] + else: + cmdline +=3D [ '-a', arch ] if 'opts' in b: for name in b['opts'].split(): section =3D 'opts.' + name @@ -235,7 +248,7 @@ def build_one(cfg, build, jobs =3D None, silent =3D Fal= se, nologs =3D False): =20 def build_basetools(silent =3D False, nologs =3D False): build_message('building: BaseTools', silent =3D silent) - basedir =3D os.environ['EDK_TOOLS_PATH'] + basedir =3D os.environ['EDK_TOOLS_PATH'] + '/Source/C' cmdline =3D [ 'make', '-C', basedir ] build_run(cmdline, 'BaseTools', 'build.basetools', silent, nologs) =20 --=20 2.52.0