subject:"\[edk2\] \[Patch\] NetworkPkg\: Fix IpsecConfig GCC build failure issue"

Re: [edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

2016-03-08 Thread Fu, Siyuan

Reviewed-by: Fu Siyuan 

> -Original Message-
> From: Wu, Jiaxin
> Sent: Wednesday, March 9, 2016 8:59 AM
> To: edk2-devel@lists.01.org
> Cc: Fu, Siyuan ; Zhang, Lubo 
> Subject: [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue
> 
> This issue is caused by the string token ID for help message,
> which is defined in the internal head file.
> This head file is used for reference more than once. So,
> multiple definition for the string token ID error will be
> enrolled.
> 
> Cc: Fu Siyuan 
> Cc: Zhang Lubo 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jiaxin Wu 
> ---
>  NetworkPkg/Application/IpsecConfig/IpSecConfig.c | 7 ++-
>  NetworkPkg/Application/IpsecConfig/IpSecConfig.h | 7 +--
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> index ff895bc..274f582 100644
> --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> @@ -1,9 +1,9 @@
>  /** @file
>The main process for IpSecConfig application.
> 
> -  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> +  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
> 
>This program and the accompanying materials
>are licensed and made available under the terms and conditions of the BSD
> License
>which accompanies this distribution.  The full text of the license may be
> found at
>http://opensource.org/licenses/bsd-license.php.
> @@ -24,10 +24,15 @@
>  #include "PolicyEntryOperation.h"
>  #include "Delete.h"
>  #include "Helper.h"
> 
>  //
> +// String token ID of IpSecConfig command help message text.
> +//
> +GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID
> mStringIpSecHelpTokenId = STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
> +
> +//
>  // Used for ShellCommandLineParseEx only
>  // and to ensure user inputs are in valid format
>  //
>  SHELL_PARAM_ITEMmIpSecConfigParamList[] = {
>{ L"-p",TypeValue },
> diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> index 244926f..8ebc599 100644
> --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> @@ -1,9 +1,9 @@
>  /** @file
>The internal structure and function declaration in IpSecConfig application.
> 
> -  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> +  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
> 
>This program and the accompanying materials
>are licensed and made available under the terms and conditions of the BSD
> License
>which accompanies this distribution.  The full text of the license may be
> found at
>http://opensource.org/licenses/bsd-license.php.
> @@ -25,15 +25,10 @@
>  #include 
>  #include 
> 
>  #include 
> 
> -//
> -// String token ID of VConfig command help message text.
> -//
> -GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID
> mStringIpSecHelpTokenId = STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
> -
>  #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
> 
>  #define IPSECCONFIG_STATUS_NAMEL"IpSecStatus"
> 
>  #define BIT(x)   (UINT32) (1 << (x))
> --
> 1.9.5.msysgit.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

2016-03-08 Thread Zhang, Lubo

Reviewed-by: Zhang, Lubo 

-Original Message-
From: Wu, Jiaxin 
Sent: Wednesday, March 09, 2016 8:59 AM
To: edk2-devel@lists.01.org
Cc: Fu, Siyuan ; Zhang, Lubo 
Subject: [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

This issue is caused by the string token ID for help message, which is defined 
in the internal head file.
This head file is used for reference more than once. So, multiple definition 
for the string token ID error will be enrolled.

Cc: Fu Siyuan 
Cc: Zhang Lubo 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu 
---
 NetworkPkg/Application/IpsecConfig/IpSecConfig.c | 7 ++-  
NetworkPkg/Application/IpsecConfig/IpSecConfig.h | 7 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c 
b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index ff895bc..274f582 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -1,9 +1,9 @@
 /** @file
   The main process for IpSecConfig application.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights 
+ reserved.
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
   http://opensource.org/licenses/bsd-license.php.
@@ -24,10 +24,15 @@
 #include "PolicyEntryOperation.h"
 #include "Delete.h"
 #include "Helper.h"
 
 //
+// String token ID of IpSecConfig command help message text.
+//
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mStringIpSecHelpTokenId = 
+STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
+
+//
 // Used for ShellCommandLineParseEx only  // and to ensure user inputs are in 
valid format  //
 SHELL_PARAM_ITEMmIpSecConfigParamList[] = {
   { L"-p",TypeValue },
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h 
b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
index 244926f..8ebc599 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
@@ -1,9 +1,9 @@
 /** @file
   The internal structure and function declaration in IpSecConfig application.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights 
+ reserved.
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
   http://opensource.org/licenses/bsd-license.php.
@@ -25,15 +25,10 @@
 #include   #include 
 
 #include 
 
-//
-// String token ID of VConfig command help message text.
-//
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mStringIpSecHelpTokenId = 
STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
-
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
 #define IPSECCONFIG_STATUS_NAMEL"IpSecStatus"
 
 #define BIT(x)   (UINT32) (1 << (x))
--
1.9.5.msysgit.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

2016-03-08 Thread Gao, Liming

Reviewed-by: Liming Gao <liming@intel.com>

> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Jiaxin Wu
> Sent: Wednesday, March 09, 2016 8:59 AM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Lubo; Fu, Siyuan
> Subject: [edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue
> 
> This issue is caused by the string token ID for help message,
> which is defined in the internal head file.
> This head file is used for reference more than once. So,
> multiple definition for the string token ID error will be
> enrolled.
> 
> Cc: Fu Siyuan <siyuan...@intel.com>
> Cc: Zhang Lubo <lubo.zh...@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jiaxin Wu <jiaxin...@intel.com>
> ---
>  NetworkPkg/Application/IpsecConfig/IpSecConfig.c | 7 ++-
>  NetworkPkg/Application/IpsecConfig/IpSecConfig.h | 7 +--
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> index ff895bc..274f582 100644
> --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
> @@ -1,9 +1,9 @@
>  /** @file
>The main process for IpSecConfig application.
> 
> -  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> +  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
> 
>This program and the accompanying materials
>are licensed and made available under the terms and conditions of the BSD
> License
>which accompanies this distribution.  The full text of the license may be
> found at
>http://opensource.org/licenses/bsd-license.php.
> @@ -24,10 +24,15 @@
>  #include "PolicyEntryOperation.h"
>  #include "Delete.h"
>  #include "Helper.h"
> 
>  //
> +// String token ID of IpSecConfig command help message text.
> +//
> +GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID
> mStringIpSecHelpTokenId = STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
> +
> +//
>  // Used for ShellCommandLineParseEx only
>  // and to ensure user inputs are in valid format
>  //
>  SHELL_PARAM_ITEMmIpSecConfigParamList[] = {
>{ L"-p",TypeValue },
> diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> index 244926f..8ebc599 100644
> --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
> @@ -1,9 +1,9 @@
>  /** @file
>The internal structure and function declaration in IpSecConfig application.
> 
> -  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> +  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
> 
>This program and the accompanying materials
>are licensed and made available under the terms and conditions of the BSD
> License
>which accompanies this distribution.  The full text of the license may be
> found at
>http://opensource.org/licenses/bsd-license.php.
> @@ -25,15 +25,10 @@
>  #include 
>  #include 
> 
>  #include 
> 
> -//
> -// String token ID of VConfig command help message text.
> -//
> -GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID
> mStringIpSecHelpTokenId = STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
> -
>  #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
> 
>  #define IPSECCONFIG_STATUS_NAMEL"IpSecStatus"
> 
>  #define BIT(x)   (UINT32) (1 << (x))
> --
> 1.9.5.msysgit.1
> 
> ___
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

2016-03-08 Thread Jiaxin Wu

This issue is caused by the string token ID for help message,
which is defined in the internal head file.
This head file is used for reference more than once. So,
multiple definition for the string token ID error will be
enrolled.

Cc: Fu Siyuan 
Cc: Zhang Lubo 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu 
---
 NetworkPkg/Application/IpsecConfig/IpSecConfig.c | 7 ++-
 NetworkPkg/Application/IpsecConfig/IpSecConfig.h | 7 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c 
b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index ff895bc..274f582 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -1,9 +1,9 @@
 /** @file
   The main process for IpSecConfig application.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
   http://opensource.org/licenses/bsd-license.php.
@@ -24,10 +24,15 @@
 #include "PolicyEntryOperation.h"
 #include "Delete.h"
 #include "Helper.h"
 
 //
+// String token ID of IpSecConfig command help message text.
+//
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mStringIpSecHelpTokenId = 
STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
+
+//
 // Used for ShellCommandLineParseEx only
 // and to ensure user inputs are in valid format
 //
 SHELL_PARAM_ITEMmIpSecConfigParamList[] = {
   { L"-p",TypeValue },
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h 
b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
index 244926f..8ebc599 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
@@ -1,9 +1,9 @@
 /** @file
   The internal structure and function declaration in IpSecConfig application.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
   http://opensource.org/licenses/bsd-license.php.
@@ -25,15 +25,10 @@
 #include 
 #include 
 
 #include 
 
-//
-// String token ID of VConfig command help message text.
-//
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mStringIpSecHelpTokenId = 
STRING_TOKEN (STR_IPSEC_CONFIG_HELP);
-
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
 #define IPSECCONFIG_STATUS_NAMEL"IpSecStatus"
 
 #define BIT(x)   (UINT32) (1 << (x))
-- 
1.9.5.msysgit.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

Re: [edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

Re: [edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

[edk2] [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue

4 matches

Site Navigation

Mail list logo

Footer information