From patchwork Thu Jun 6 13:31:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 10979541 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 CE00617D2 for ; Thu, 6 Jun 2019 13:33:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C02CD28992 for ; Thu, 6 Jun 2019 13:33:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4D6A28986; Thu, 6 Jun 2019 13:33:01 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 552022897B for ; Thu, 6 Jun 2019 13:33:01 +0000 (UTC) Received: from localhost ([127.0.0.1]:60656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYsVo-0007dH-Fp for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Jun 2019 09:33:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYsUJ-0006LJ-DY for qemu-devel@nongnu.org; Thu, 06 Jun 2019 09:31:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYsUI-0008Qj-8t for qemu-devel@nongnu.org; Thu, 06 Jun 2019 09:31:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41978) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYsUI-0008NX-3L for qemu-devel@nongnu.org; Thu, 06 Jun 2019 09:31:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A2F7EE56A for ; Thu, 6 Jun 2019 13:31:20 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-196.ams2.redhat.com [10.36.116.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78FC56841C; Thu, 6 Jun 2019 13:31:18 +0000 (UTC) From: Laszlo Ersek To: qemu devel list Date: Thu, 6 Jun 2019 15:31:05 +0200 Message-Id: <20190606133110.13754-2-lersek@redhat.com> In-Reply-To: <20190606133110.13754-1-lersek@redhat.com> References: <20190606133110.13754-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 06 Jun 2019 13:31:25 +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] [PATCH 1/6] roms/Makefile.edk2: define edk2-stable201905 network feature test macros 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Due to edk2 commits 631195044ff0 ("OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file.", 2019-05-16) and 157a3b1aa50f ("ArmVirtPkg: Update DSC/FDF to use NetworkPkg's include fragment file.", 2019-05-16), we'll have to pefix the HTTP_BOOT_ENABLE and TLS_ENABLE build flags with "NETWORK_", for building edk2 at tag "edk2-stable201905". Right now the new flags are no-ops, so we can insert them separately, before advancing our edk2 submodule reference. We will remove the old flags afterwards. Cc: Philippe Mathieu-Daudé Ref: https://bugs.launchpad.net/qemu/+bug/1831477 Signed-off-by: Laszlo Ersek --- roms/Makefile.edk2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 822c547fec64..071d6e454b68 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -57,6 +57,7 @@ submodules: --arch=AARCH64 \ --platform=ArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ -D HTTP_BOOT_ENABLE cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \ $@ @@ -68,6 +69,7 @@ submodules: --arch=ARM \ --platform=ArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ -D HTTP_BOOT_ENABLE cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.fd \ $@ @@ -79,7 +81,9 @@ submodules: --arch=IA32 \ --platform=OvmfPkg/OvmfPkgIa32.dsc \ -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ -D HTTP_BOOT_ENABLE \ + -D NETWORK_TLS_ENABLE \ -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE @@ -91,7 +95,9 @@ submodules: --arch=IA32 \ --platform=OvmfPkg/OvmfPkgIa32.dsc \ -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ -D HTTP_BOOT_ENABLE \ + -D NETWORK_TLS_ENABLE \ -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE \ @@ -105,7 +111,9 @@ submodules: --arch=X64 \ --platform=OvmfPkg/OvmfPkgX64.dsc \ -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ -D HTTP_BOOT_ENABLE \ + -D NETWORK_TLS_ENABLE \ -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE @@ -118,7 +126,9 @@ submodules: --arch=X64 \ --platform=OvmfPkg/OvmfPkgIa32X64.dsc \ -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ -D HTTP_BOOT_ENABLE \ + -D NETWORK_TLS_ENABLE \ -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE \