From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.groups.io with SMTP id smtpd.web09.14118.1605131935318780376 for ; Wed, 11 Nov 2020 13:58:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MelRiA+/; spf=pass (domain: redhat.com, ip: 63.128.21.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605131934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ur0dAkWgtIajYSE8nIOiR/DoUlG4LmLOt9VMVfvCuks=; b=MelRiA+/ObIE+P7A7N2V4wNEHzFdqXVj1Cz8y7C5kJJzXdQQv+jrG80cxxlDiD3FlB1626 8f65b/stZ2LPdTn6kzm9vgoW7bmKhVGJc5W8nXGewhXDr8sz9R48zESLNtxMdHh7UAz9Wv 5QN7JH/HGsQRlFeNGrcj43n+rgUZu4E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-r0bO8vWdMlaJXkndRo9Qpg-1; Wed, 11 Nov 2020 16:58:50 -0500 X-MC-Unique: r0bO8vWdMlaJXkndRo9Qpg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76B81905C55; Wed, 11 Nov 2020 21:58:49 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-85.ams2.redhat.com [10.36.113.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5736210013BD; Wed, 11 Nov 2020 21:58:48 +0000 (UTC) Subject: Re: [PATCH V3 06/12] ArmVirtPkg/ArmVirtQemuKernel.dsc: Enable MD5 while enable iSCSI To: Zhichao Gao , devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm References: <20201110173651.54036-1-zhichao.gao@intel.com> <20201110173651.54036-7-zhichao.gao@intel.com> From: "Laszlo Ersek" Message-ID: <7e657174-fd99-8c0e-abbc-142f8eba094c@redhat.com> Date: Wed, 11 Nov 2020 22:58:47 +0100 MIME-Version: 1.0 In-Reply-To: <20201110173651.54036-7-zhichao.gao@intel.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 11/10/20 18:36, Zhichao Gao wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3003 > > There is a plan to make MD5 disable as default. > The new MACRO ENABLE_MD5_DEPRECATED_INTERFACES > would be introduced to enable MD5. Make the > definition ahead of the change to avoid build > error after the MACRO changed. > > Enalbe iSCSI. (1) typo > > Signed-off-by: Zhichao Gao > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: Leif Lindholm > --- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 9449a01d6e..714dc6cf89 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -1,7 +1,7 @@ > # > # Copyright (c) 2011-2015, ARM Limited. All rights reserved. > # Copyright (c) 2014, Linaro Limited. All rights reserved. > -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. > +# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -38,6 +38,7 @@ > DEFINE NETWORK_SNP_ENABLE = FALSE > DEFINE NETWORK_TLS_ENABLE = FALSE > DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE > + DEFINE NETWORK_ISCSI_ENABLE = TRUE > > !if $(NETWORK_SNP_ENABLE) == TRUE > !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only" > @@ -47,6 +48,11 @@ > > !include ArmVirtPkg/ArmVirt.dsc.inc > > +[BuildOptions] > +!if $(NETWORK_ISCSI_ENABLE) == TRUE > + *_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES > +!endif > + > [LibraryClasses.common] > ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf > ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf > (2) please locate the existent [BuildOptions] section in this file, and add the !include directive instead of the open-coded flags. Like this: > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 9449a01d6e40..c5f7e1c37b6f 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -84,6 +84,7 @@ [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > [BuildOptions] > +!include NetworkPkg/NetworkBuildOptions.dsc.inc > # > # We need to avoid jump tables in SEC modules, so that the PE/COFF > # self-relocation code itself is guaranteed to be position independent. Thanks Laszlo