[edk2-devel] [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable iSCSI

[Gao, Zhichao]

I just notice many platforms (such as the platform dsc file in edk2Platforms) are using the inc file incorrectly. I would adjust the [BuildOptions] section above [Components] section to unblock their build.

Thanks,
Zhichao

> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Gao,
> Zhichao
> Sent: Thursday, November 12, 2020 1:56 PM
> To: devel at edk2.groups.io
> Cc: Maciej Rabeda <maciej.rabeda at linux.intel.com>; Wu, Jiaxin
> <jiaxin.wu at intel.com>; Fu, Siyuan <siyuan.fu at intel.com>
> Subject: [edk2-devel] [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable
> iSCSI
> 
> 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.
> 1. Add the NetworkBuildOptions.dsc.inc to define the MACRO for build (support:
> GCC, INTEL, MSFT and
> RVCT)
> 2. Add the BuildOption file to Network.dsc.inc
> 
> Cc: Maciej Rabeda <maciej.rabeda at linux.intel.com>
> Cc: Jiaxin Wu <jiaxin.wu at intel.com>
> Cc: Siyuan Fu <siyuan.fu at intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao at intel.com>
> ---
>  NetworkPkg/Network.dsc.inc             |  5 ++++-
>  NetworkPkg/NetworkBuildOptions.dsc.inc | 22 ++++++++++++++++++++++
>  2 files changed, 26 insertions(+), 1 deletion(-)  create mode 100644
> NetworkPkg/NetworkBuildOptions.dsc.inc
> 
> diff --git a/NetworkPkg/Network.dsc.inc b/NetworkPkg/Network.dsc.inc index
> 16f090a187..6cd0c005fc 100644
> --- a/NetworkPkg/Network.dsc.inc
> +++ b/NetworkPkg/Network.dsc.inc
> @@ -7,7 +7,7 @@
>  # This file defines one build flag PLATFORMX64_ENABLE to support  # IA32 PEI
> and X64 DXE platform. Its default value is FALSE.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights
> +reserved.<BR>
>  # Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>  #
>  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -39,3 +39,6 @@
>  !include NetworkPkg/NetworkComponents.dsc.inc
> 
>  !endif
> +
> +[BuildOptions]
> +!include NetworkPkg/NetworkBuildOptions.dsc.inc
> diff --git a/NetworkPkg/NetworkBuildOptions.dsc.inc
> b/NetworkPkg/NetworkBuildOptions.dsc.inc
> new file mode 100644
> index 0000000000..ce3460d472
> --- /dev/null
> +++ b/NetworkPkg/NetworkBuildOptions.dsc.inc
> @@ -0,0 +1,22 @@
> +## @file
> +# Network DSC include file for [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".
> +#
> +# Supported tool chain: "GCC:", "INTEL:", "MSFT:", "RVCT".
> +#
> +# Copyright (c) 2020, Intel Corporation. All rights reserved.<BR> #
> +#    SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +##
> +
> +!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
> --
> 2.21.0.windows.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67525): https://edk2.groups.io/g/devel/message/67525
Mute This Topic: https://groups.io/mt/78227047/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-