From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C75CC04AB5 for ; Thu, 6 Jun 2019 13:36:34 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id E075C20673 for ; Thu, 6 Jun 2019 13:36:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E075C20673 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:60728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYsZF-0001dA-54 for qemu-devel@archiver.kernel.org; Thu, 06 Jun 2019 09:36:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYsUh-0006d1-1J for qemu-devel@nongnu.org; Thu, 06 Jun 2019 09:31:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYsUV-00015S-35 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 09:31:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40920) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYsUT-0000wZ-B6 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 09:31:38 -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 B7DBD30BBE69 for ; Thu, 6 Jun 2019 13:31:32 +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 C0B5368424; Thu, 6 Jun 2019 13:31:26 +0000 (UTC) From: Laszlo Ersek To: qemu devel list Date: Thu, 6 Jun 2019 15:31:07 +0200 Message-Id: <20190606133110.13754-4-lersek@redhat.com> In-Reply-To: <20190606133110.13754-1-lersek@redhat.com> References: <20190606133110.13754-1-lersek@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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.49]); Thu, 06 Jun 2019 13:31:32 +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 3/6] roms/Makefile.edk2: remove edk2-stable201903 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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" At tag "edk2-stable201905", the build flags HTTP_BOOT_ENABLE and TLS_ENABLE have become useless. Their roles have been taken by NETWORK_HTTP_BOOT_ENABLE and NETWORK_TLS_ENABLE, respectively. Remove the old build flags. Cc: Philippe Mathieu-Daud=C3=A9 Ref: https://bugs.launchpad.net/qemu/+bug/1831477 Signed-off-by: Laszlo Ersek --- roms/Makefile.edk2 | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 071d6e454b68..6a19498d0738 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -57,8 +57,7 @@ submodules: --arch=3DAARCH64 \ --platform=3DArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ - -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE + -D NETWORK_HTTP_BOOT_ENABLE cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QE= MU_EFI.fd \ $@ truncate --size=3D64M $@ @@ -69,8 +68,7 @@ submodules: --arch=3DARM \ --platform=3DArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ - -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE + -D NETWORK_HTTP_BOOT_ENABLE cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.f= d \ $@ truncate --size=3D64M $@ @@ -82,9 +80,7 @@ submodules: --platform=3DOvmfPkg/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 cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ @@ -96,9 +92,7 @@ submodules: --platform=3DOvmfPkg/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 \ -D SECURE_BOOT_ENABLE \ @@ -112,9 +106,7 @@ submodules: --platform=3DOvmfPkg/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 cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ @@ -127,9 +119,7 @@ submodules: --platform=3DOvmfPkg/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 \ -D SECURE_BOOT_ENABLE \ --=20 2.19.1.3.g30247aa5d201