From nobody Tue May 7 01:10:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554817669; cv=none; d=zoho.com; s=zohoarc; b=PMZqKY6oC3/34tE75F+RnGwy7fbYcsDZVpC2sBqgOuyGJ9UvjUf/vkylgYbbplkirsSuM8vGy1gyCqBuzQfaCO4E/Ko87Z9PRG25isocqErWgX8ZCuhHR0mn5J3graQf16ykhRG395P43JNCHHvOEvJD2ZXHGI27WvTf3XCxaK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554817669; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=50RrT8yUyVqEfJv4bL3+KtdB/XNJSuEJCiL5kXEaoNE=; b=I3vmzgI1N/sfyYqhB15SPcKdBdEh5OeGq10Mx4BkSRib1db5MlDxpwh5mxqOFEWzkExMuGMuXYXRKhyCF2c5kjGqz/kOT8WxSEt6w3l4tGoCqQROgKz4pVT+aEdIAVsNy2TFQ0T+87eQZAE48j/fw36IgtzlczfjY4m/vNarMp8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554817669295828.6775340702723; Tue, 9 Apr 2019 06:47:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:41974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDr6C-0006XJ-3a for importer@patchew.org; Tue, 09 Apr 2019 09:47:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDr4S-0005bM-PI for qemu-devel@nongnu.org; Tue, 09 Apr 2019 09:45:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDr4R-00013i-QX for qemu-devel@nongnu.org; Tue, 09 Apr 2019 09:45:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDr4R-00013Q-FZ for qemu-devel@nongnu.org; Tue, 09 Apr 2019 09:45:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C870C30832CE; Tue, 9 Apr 2019 13:45:50 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F5DE5D9C9; Tue, 9 Apr 2019 13:45:48 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laszlo Ersek , qemu-devel@nongnu.org, Olaf Hering Date: Tue, 9 Apr 2019 15:45:35 +0200 Message-Id: <20190409134536.15548-2-philmd@redhat.com> In-Reply-To: <20190409134536.15548-1-philmd@redhat.com> References: <20190409134536.15548-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 09 Apr 2019 13:45:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.0 v3 1/2] roms: Rename the EFIROM variable to avoid clashing with iPXE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The iPXE's 'veryclean' recipe removes $(EFIROM) even if the EFIROM macro originates from elsewhere: $ git checkout f590a812c21~ $ make -C roms clean EFIROM=3D$(type -P EfiRom) make: Entering directory '/source/qemu/roms' [...] make -C ipxe/src veryclean make[1]: Entering directory '/source/qemu/roms/ipxe/src' rm -f bin{,-*}/*.* bin{,-*}/.certificate.* bin{,-*}/.certificates.* bin{,= -*}/.private_key.* bin{,-*}/errors bin{,-*}/NIC ./util/zbin ./util/elf2efi3= 2 ./util/elf2efi64 /usr/bin/EfiRom ./util/efifatbin ./util/iccfix ./util/ei= nfo TAGS bin{,-*}/symtab rm: cannot remove '/usr/bin/EfiRom': Permission denied make[1]: *** [Makefile.housekeeping:1564: clean] Error 1 make[1]: Leaving directory '/source/qemu/roms/ipxe/src' make: *** [Makefile:152: clean] Error 2 make: Leaving directory '/source/qemu/roms' Before f590a812c21 this variable could be overridden or unset, and the 'veryclean' Makefile rule would not complain. Commit f590a812c21 enforces this variable to the Intel EfiRom tool provided by the EDK2 project. To avoid the name clash and make the difference between the projects obvious, rename the variable used by the EDK2 project as EDK2_EFIROM. Fixes: f590a812c21074e82228de3e1dfb57b75fc02b62 Reported-by: Olaf Hering Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin --- roms/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index 78d5dd18c30..d28252dafdf 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -47,7 +47,7 @@ SEABIOS_EXTRAVERSION=3D"-prebuilt.qemu.org" # We need that to combine multiple images (legacy bios, # efi ia32, efi x64) into a single rom binary. # -EFIROM =3D edk2/BaseTools/Source/C/bin/EfiRom +EDK2_EFIROM =3D edk2/BaseTools/Source/C/bin/EfiRom =20 default: @echo "nothing is build by default" @@ -102,8 +102,8 @@ pxe-rom-%: build-pxe-roms =20 efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) =20 -efi-rom-%: build-pxe-roms build-efi-roms $(EFIROM) - $(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ +efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM) + $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ -b ipxe/src/bin/$(VID)$(DID).rom \ -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \ @@ -120,7 +120,7 @@ build-efi-roms: build-pxe-roms $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) =20 -$(EFIROM): +$(EDK2_EFIROM): $(MAKE) -C edk2/BaseTools =20 slof: --=20 2.20.1 From nobody Tue May 7 01:10:03 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554817785; cv=none; d=zoho.com; s=zohoarc; b=Q/dwqfU7hWD6qLPsb4Gzc6h76E+6XeT3AM/CI65eexF6JYfiBDJmeZDtH3Y7FLbwzYt3lhYddRK9wgRmRzw6w7kJsSz4AC4Y4lE1U60N15uNc9oDmxw5CWejtr8yKemIsPkeDnQOAgtAb6X8Q6aVvVOdAXLWIJx5nwKItuaEfuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554817785; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9jSW+OmGEE9T81L9GBEGwfft+G8QXdL98kbdAtDQwd0=; b=dv3P7jMqJ29IHqh/v0oaY2/BBhzyulgKoS3Fdb2xvDlo+up4TBXM2PXWPorJjA5R8vuqyfD0axYYZY6jVkJBNr9IH70QxfXyfPYcT5oLExlDypSKGO8IGE112Fdw2gi0mhIlH9l6RVGUy0k+Lcm2+gkSszvyB2jlb0+Noo/EKZg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554817785067778.2867883444608; Tue, 9 Apr 2019 06:49:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:41990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDr7z-0007pm-TG for importer@patchew.org; Tue, 09 Apr 2019 09:49:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDr4V-0005bg-F1 for qemu-devel@nongnu.org; Tue, 09 Apr 2019 09:45:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDr4U-00014d-Di for qemu-devel@nongnu.org; Tue, 09 Apr 2019 09:45:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35538) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDr4U-00014Q-5v for qemu-devel@nongnu.org; Tue, 09 Apr 2019 09:45:54 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7955F88AB3; Tue, 9 Apr 2019 13:45:53 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 41AE75D9C9; Tue, 9 Apr 2019 13:45:51 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laszlo Ersek , qemu-devel@nongnu.org, Olaf Hering Date: Tue, 9 Apr 2019 15:45:36 +0200 Message-Id: <20190409134536.15548-3-philmd@redhat.com> In-Reply-To: <20190409134536.15548-1-philmd@redhat.com> References: <20190409134536.15548-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 09 Apr 2019 13:45:53 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.0 v3 2/2] roms: Allow passing configure options to the EDK2 build tools X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Since commit f590a812c210 we build the EDK2 EfiRom utility unconditionally. Some distributions require to use extra compiler/linker flags, i.e. SUSE which enforces the PIE protection (see [*]). EDK2 build tools already provide a set of variables for that, use them to allow the caller to easily inject compiler/linker options.. Now build scripts can pass extra options, example: $ make -C roms \ EDK2_BASETOOLS_OPTFLAGS=3D'-fPIE' \ efirom [*] https://lists.opensuse.org/opensuse-factory/2017-06/msg00403.html Reported-by: Olaf Hering Suggested-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov Reviewed-by: Laszlo Ersek Reviewed-by: Michael S. Tsirkin --- roms/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile index d28252dafdf..1ff78b63bb3 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -120,8 +120,21 @@ build-efi-roms: build-pxe-roms $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) =20 +# Build scripts can pass compiler/linker flags to the EDK2 build tools +# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and +# EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables. +# +# Example: +# +# make -C roms \ +# EDK2_BASETOOLS_OPTFLAGS=3D'...' \ +# EDK2_BASETOOLS_LDFLAGS=3D'...' \ +# efirom +# $(EDK2_EFIROM): - $(MAKE) -C edk2/BaseTools + $(MAKE) -C edk2/BaseTools \ + EXTRA_OPTFLAGS=3D'$(EDK2_BASETOOLS_OPTFLAGS)' \ + EXTRA_LDFLAGS=3D'$(EDK2_BASETOOLS_LDFLAGS)' =20 slof: $(MAKE) -C SLOF CROSS=3D$(powerpc64_cross_prefix) qemu --=20 2.20.1