From nobody Sun Dec 29 18:12:10 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1718971322; cv=none; d=zohomail.com; s=zohoarc; b=lhf0OVHya8FZnynXfBocfgp8GuFOvQJRk44QMrkKt9HKc5QcFTOPam3ObgFj3dT7loyXYSLyIXODbChvhpnfVe4qUTOZipXQPzRdNSVqRL+zNKn1P9WEgQHclPhYWQqp4JSPoliqu8TX75zcMqf9JQiLbcrmcCLToqhsleEOpB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718971322; 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=pvZbx7Qhc09keL1vmWRUuQcCdr8TgH4NHpQR9QL+77M=; b=N7jAqeuZ1/D+VolvErWk5zrKUlhDMekAgsOwwtAcbxK8Ou1BypQxjwu1bJFGvjz/pB3Fhxc7snIjjpGsm2yDECw+7QtkSI3WqQAKH+A3heTJEId37t3VBFUMw1z4bhWoUlxOSuQwOqzmODqHWqiyVswrqhptNW6cXFdyaO0lvXk= 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+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1718971322370455.3287510461163; Fri, 21 Jun 2024 05:02:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKcvY-00047j-DJ; Fri, 21 Jun 2024 07:59:36 -0400 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 1sKcvS-000437-Px for qemu-devel@nongnu.org; Fri, 21 Jun 2024 07:59:31 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sKcvQ-00035l-TY for qemu-devel@nongnu.org; Fri, 21 Jun 2024 07:59:30 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1f47f07acd3so15774115ad.0 for ; Fri, 21 Jun 2024 04:59:28 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9ebbb606dsm12422995ad.270.2024.06.21.04.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 04:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1718971166; x=1719575966; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pvZbx7Qhc09keL1vmWRUuQcCdr8TgH4NHpQR9QL+77M=; b=U13nhwAtDExA58rH9mScbkSYHygFSAbfi18WWCMFEZInBmn3yUU3Fee/0P6rs91BVz aXlvepNKHxbYBgLXSarHCjNp9bPxpJOM8o5yuB2O8XIOEQryaRYWYmTQSCWPY79FB+Ci Izh+Yio+eYFhevbnxmdc2X0ZDTt00rgp9e3FX3BckKcDEwM2fxzG8ImGWVdl1Dh1eUMV mcydLjHOsVbTRAiOarZ3T3HYVcfkw7FnyX6dhVdkhi/PgghMtnBBOn/SbeNH0rVEMYFK wj3v0acNd3mkwsiQumOZ0T1pY8cHaU4+momZYD9nJa6eVxh/+GAitnKHHsvarCZH5TYI 7hEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718971166; x=1719575966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pvZbx7Qhc09keL1vmWRUuQcCdr8TgH4NHpQR9QL+77M=; b=X1EMHYdc9ZLou7cD41QWuhMukseORRxD3srQxzypFakbCtcxx4WYtCZj5OG53TjwnH TS/q7VsGB49YNAK26PA9QL2Peloq3o9xgBy9eABjFVqUxNeL3NTIwKjLWc0E0TdYkxng IGPoymZqbqyy5sDKspYUP5ALeOux4BWQtQ0ruNzeIL0cQysAxjuodiYqF4Q/J5XLwl6t JeYMkAyC0uf+Pab+CjIf9HKGYBxmiGxiWzt9rAH6mPpAgjFqygQJiBvmrw53/OJe3CeK jFlJRunkDRMfUXpWNTC2UC3pgZnAwQTPBCderoHY1D9E4+60UaJwlauLoh3wknfowoDq VocQ== X-Gm-Message-State: AOJu0YzvlTwz1pnslu30IFftmbI5lrONGv6vXUHRs+0wfQHKqf7nbvs8 SkgYDsRVasZ2nGh88KcrhZRw1upo3EIs9QPqPRbNzroaKlmwkMYa+VQbOukeywVKxbWyRCoHW1X n X-Google-Smtp-Source: AGHT+IHC/ghMRLj0e7Jvxxgk9YcK64gbe4c6qfMfy0L7og14ZtAL8XH6dmBN2wBYGrbAJPzKkSx7MA== X-Received: by 2002:a17:903:1cf:b0:1f9:a4bf:de10 with SMTP id d9443c01a7336-1f9aa3a5cd8mr98437135ad.2.1718971166278; Fri, 21 Jun 2024 04:59:26 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Gerd Hoffmann , Sia Jee Heng , Alistair Francis , Daniel Henrique Barboza , Palmer Dabbelt , Bin Meng , Weiwei Li , Liu Zhiwei , Sunil V L Subject: [PATCH v3 02/15] uefi-test-tools: Add support for python based build script Date: Fri, 21 Jun 2024 17:28:53 +0530 Message-Id: <20240621115906.1049832-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240621115906.1049832-1-sunilvl@ventanamicro.com> References: <20240621115906.1049832-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=sunilvl@ventanamicro.com; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1718971324323100007 Content-Type: text/plain; charset="utf-8" edk2-funcs.sh which is used in this Makefile, was removed in the commit c28a2891f3 ("edk2: update build script"). It is replaced with a python based script. So, update the Makefile and add the configuration file as required to support the python based build script. Signed-off-by: Sunil V L Acked-by: Gerd Hoffmann Acked-by: Igor Mammedov --- tests/uefi-test-tools/Makefile | 19 +++---- tests/uefi-test-tools/uefi-test-build.config | 52 ++++++++++++++++++++ 2 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 tests/uefi-test-tools/uefi-test-build.config diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile index 0c003f2877..f4eaebd8ff 100644 --- a/tests/uefi-test-tools/Makefile +++ b/tests/uefi-test-tools/Makefile @@ -12,7 +12,7 @@ =20 edk2_dir :=3D ../../roms/edk2 images_dir :=3D ../data/uefi-boot-images -emulation_targets :=3D arm aarch64 i386 x86_64 +emulation_targets :=3D arm aarch64 i386 x86_64 riscv64 uefi_binaries :=3D bios-tables-test intermediate_suffixes :=3D .efi .fat .iso.raw =20 @@ -56,7 +56,8 @@ Build/%.iso.raw: Build/%.fat # stripped from, the argument. map_arm_to_uefi =3D $(subst arm,ARM,$(1)) map_aarch64_to_uefi =3D $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1))) -map_i386_to_uefi =3D $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1))) +map_riscv64_to_uefi =3D $(subst riscv64,RISCV64,$(call map_aarch64_to_uefi= ,$(1))) +map_i386_to_uefi =3D $(subst i386,IA32,$(call map_riscv64_to_uefi,$(1))) map_x86_64_to_uefi =3D $(subst x86_64,X64,$(call map_i386_to_uefi,$(1))) map_to_uefi =3D $(subst .,,$(call map_x86_64_to_uefi,$(1))) =20 @@ -70,7 +71,7 @@ Build/%.fat: Build/%.efi uefi_bin_b=3D$$(stat --format=3D%s -- $<) && \ uefi_fat_kb=3D$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \ uefi_fat_kb=3D$$(( uefi_fat_kb >=3D 64 ? uefi_fat_kb : 64 )) && \ - mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb + mkdosfs -C $@ -n "bios-test" -- $$uefi_fat_kb MTOOLS_SKIP_CHECK=3D1 mmd -i $@ ::EFI MTOOLS_SKIP_CHECK=3D1 mmd -i $@ ::EFI/BOOT MTOOLS_SKIP_CHECK=3D1 mcopy -i $@ -- $< \ @@ -95,15 +96,9 @@ Build/%.fat: Build/%.efi # we must mark the recipe manually as recursive, by using the "+" indicato= r. # This way, when the inner "make" starts a parallel build of the target ed= k2 # module, it can communicate with the outer "make"'s job server. -Build/bios-tables-test.%.efi: build-edk2-tools - +./build.sh $(edk2_dir) BiosTablesTest $* $@ - -build-edk2-tools: - cd $(edk2_dir)/BaseTools && git submodule update --init --force - $(MAKE) -C $(edk2_dir)/BaseTools \ - PYTHON_COMMAND=3D$${EDK2_PYTHON_COMMAND:-python3} \ - EXTRA_OPTFLAGS=3D'$(EDK2_BASETOOLS_OPTFLAGS)' \ - EXTRA_LDFLAGS=3D'$(EDK2_BASETOOLS_LDFLAGS)' +Build/bios-tables-test.%.efi: + $(PYTHON) ../../roms/edk2-build.py --config uefi-test-build.config \ + --match $* =20 clean: rm -rf Build Conf log diff --git a/tests/uefi-test-tools/uefi-test-build.config b/tests/uefi-test= -tools/uefi-test-build.config new file mode 100644 index 0000000000..1f389ae541 --- /dev/null +++ b/tests/uefi-test-tools/uefi-test-build.config @@ -0,0 +1,52 @@ +[global] +core =3D ../../roms/edk2 + +##########################################################################= ########## +# arm + +[build.arm] +conf =3D UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat =3D UefiTestTools +dest =3D ./Build +arch =3D ARM +cpy1 =3D ARM/BiosTablesTest.efi bios-tables-test.arm.efi + +##########################################################################= ########## +# aarch64 + +[build.aarch64] +conf =3D UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat =3D UefiTestTools +dest =3D ./Build +arch =3D AARCH64 +cpy1 =3D AARCH64/BiosTablesTest.efi bios-tables-test.aarch64.efi + +##########################################################################= ########## +# riscv64 + +[build.riscv] +conf =3D UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat =3D UefiTestTools +dest =3D ./Build +arch =3D RISCV64 +cpy1 =3D RISCV64/BiosTablesTest.efi bios-tables-test.riscv64.efi + +##########################################################################= ########## +# ia32 + +[build.ia32] +conf =3D UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat =3D UefiTestTools +dest =3D ./Build +arch =3D IA32 +cpy1 =3D IA32/BiosTablesTest.efi bios-tables-test.i386.efi + +##########################################################################= ########## +# x64 + +[build.x64] +conf =3D UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat =3D UefiTestTools +dest =3D ./Build +arch =3D X64 +cpy1 =3D X64/BiosTablesTest.efi bios-tables-test.x86_64.efi --=20 2.40.1