From patchwork Tue Apr 23 17:15:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 10913603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0AD8D1390 for ; Tue, 23 Apr 2019 17:27:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E191A288D2 for ; Tue, 23 Apr 2019 17:27:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4830288EE; Tue, 23 Apr 2019 17:27:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SORTED_RECIPS autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7A38A288D2 for ; Tue, 23 Apr 2019 17:27:17 +0000 (UTC) Received: from localhost ([127.0.0.1]:57133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIzCO-0005N5-OZ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Apr 2019 13:27:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIz1u-0005Kc-1y for qemu-devel@nongnu.org; Tue, 23 Apr 2019 13:16:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIz1s-0005wf-4L for qemu-devel@nongnu.org; Tue, 23 Apr 2019 13:16:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hIz1r-0005ui-U2 for qemu-devel@nongnu.org; Tue, 23 Apr 2019 13:16:24 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 795C6821DE; Tue, 23 Apr 2019 17:16:21 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-125-214.rdu2.redhat.com [10.10.125.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id D874E19729; Tue, 23 Apr 2019 17:16:18 +0000 (UTC) From: Laszlo Ersek To: berrange@redhat.com, eblake@redhat.com, f4bug@amsat.org, imammedo@redhat.com, kraxel@redhat.com, mprivozn@redhat.com, mst@redhat.com, peter.maydell@linaro.org, philmd@redhat.com, qemu-devel@nongnu.org Date: Tue, 23 Apr 2019 19:15:14 +0200 Message-Id: <20190423171520.4511-7-lersek@redhat.com> In-Reply-To: <20190423171520.4511-1-lersek@redhat.com> References: <20190423171520.4511-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 23 Apr 2019 17:16:21 +0000 (UTC) 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] [PULL 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools" 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We don't (can't) have a recipe for building just $(EDK2_EFIROM); therefore, while we call the target $(EDK2_EFIROM), we actually build all of the edk2 BaseTools. Rename the target to edk2-basetools, and update the iPXE prerequisite accordingly. This will let other targets depend on "edk2-basetools", where an $(EDK2_EFIROM) pre-requisite would be misleading. Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Acked-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- Notes: pull: - pick up Phil's R-b / T-b - pick up Michael's A-b - pick up Igor's R-b v4: - rebase: resolve conflicts with - commit d912e795e029 ("roms: Rename the EFIROM variable to avoid clashing with iPXE", 2019-04-09) - commit 1cab464136b4 ("roms: Allow passing configure options to the EDK2 build tools", 2019-04-09) - refresh commit message accordingly: replace EFIROM references with EDK2_EFIROM references - drop all previous feedback tags, consequently :( - Phil's R-b / T-b - Michal's R-b - Michael's R-b - Igor's T-b v3: - pick up Igor's T-b v2: - pick up Phil's R-b / T-b - pick up Michal's and Michael's R-b's roms/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index 1ff78b63bb3a..93c3d467be14 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -102,7 +102,7 @@ pxe-rom-%: build-pxe-roms efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) -efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM) +efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools $(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 \ @@ -131,7 +131,7 @@ build-efi-roms: build-pxe-roms # EDK2_BASETOOLS_LDFLAGS='...' \ # efirom # -$(EDK2_EFIROM): +edk2-basetools: $(MAKE) -C edk2/BaseTools \ EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'