Re: [PATCH V3 05/12] ArmVirtPkg/ArmVirtQemu.dsc: Enable MD5 while enable iSCSI

["Laszlo Ersek" <lersek@redhat.com>]

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: should be "Enable".


>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> ---
>  ArmVirtPkg/ArmVirtQemu.dsc | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 3f649c91d8..3be8448d0b 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.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
>  #
> @@ -40,6 +40,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"
> @@ -49,6 +50,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) Before this patch, please create a separate patch:

  NetworkPkg: add MD5-related build options include file for iSCSI


(2a) The patch should create the following file:

  NetworkPkg/NetworkBuildOptions.dsc.inc

with the following contents:

> # Network DSC include file for the [BuildOptions*] sections of all
> # Architectures.
> #
> # This file can be included in the [BuildOptions*] section(s) of a platform
> # DSC file by using "!include NetworkPkg/NetworkBuildOptions.dsc.inc", to
> # specify the C language feature test macros (eg., API deprecation macros)
> # according to the flags described in "NetworkDefines.dsc.inc".
>
> !if $(NETWORK_ISCSI_ENABLE) == TRUE
>   MSFT:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES
>   INTEL:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES
>   GCC:*_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES
>   RVCT:*_*_*_CC_FLAGS = -DENABLE_MD5_DEPRECATED_INTERFACES
> !endif


(2b) The same patch should append the following section to
"NetworkPkg/Network.dsc.inc":

> [BuildOptions]
> !include NetworkPkg/NetworkBuildOptions.dsc.inc


(3) In the present patch, please insert the [BuildOptions] section as
follows:

> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 3f649c91d8d6..e93c129a5045 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -105,6 +105,9 @@ [LibraryClasses.common.DXE_DRIVER]
>  [LibraryClasses.common.UEFI_DRIVER]
>    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
>
> +[BuildOptions]
> +!include NetworkPkg/NetworkBuildOptions.dsc.inc
> +
>  ################################################################################
>  #
>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform

Because this way, the new [BuildOptions] section in
"ArmVirtPkg/ArmVirtQemu.dsc" will be aligned with the *existent*
[BuildOptions] section in "ArmVirtPkg/ArmVirtQemuKernel.dsc".

Thanks!
Laszlo