1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911
  4. View patch

[edk2-devel] [PATCH 3/3] CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"

Laszlo Ersek posted 3 patches 6 years, 2 months ago
[edk2-devel] [PATCH 3/3] CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"
Posted by Laszlo Ersek 6 years, 2 months ago 
Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in
INF file", 2019-08-16) incorrectly placed "ms/uplink.h" in the
auto-generated part of [Sources], in "OpensslLib.inf".

("ms/uplink.h" was added in the right spot in "OpensslLibCrypto.inf".)

Subsequently, when commit 9f4fbd56d430 ("CryptoPkg/OpensslLib: Update
process_files.pl to generate .h files", 2019-10-30) re-generated that part
of "OpensslLib.inf", the "ms/uplink.h" file reference was lost. This
triggers a warning from the "build" utility now.

Name the header file in the right spot in [Sources].

This change makes "OpensslLib.inf" consistent with "OpensslLibCrypto.inf".

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Shenglei Zhang <shenglei.zhang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Fixes: 8906f076de35b222a7d62bcf6ed1a4a2498a5791
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    Targeting edk2-stable201911.

 CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 58202f83118d..3fa52f554320 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -23,6 +23,7 @@ [Defines]
 
 [Sources]
   $(OPENSSL_PATH)/e_os.h
+  $(OPENSSL_PATH)/ms/uplink.h
 # Autogenerated files list starts here
   $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
   $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
-- 
2.19.1.3.g30247aa5d201


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#51029): https://edk2.groups.io/g/devel/message/51029
Mute This Topic: https://groups.io/mt/61075474/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 3/3] CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"
Posted by Wang, Jian J 6 years, 2 months ago 
Laszlo,

Thanks for fixing this. 

Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

Regards,
Jian

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Laszlo Ersek
> Sent: Thursday, November 21, 2019 5:39 PM
> To: edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Leif Lindholm
> <leif.lindholm@linaro.org>; Zhang, Shenglei <shenglei.zhang@intel.com>; Lu,
> XiaoyuX <xiaoyux.lu@intel.com>
> Subject: [edk2-devel] [PATCH 3/3] CryptoPkg/OpensslLib.inf: list OpenSSL local
> header "ms/uplink.h"
> 
> Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in
> INF file", 2019-08-16) incorrectly placed "ms/uplink.h" in the
> auto-generated part of [Sources], in "OpensslLib.inf".
> 
> ("ms/uplink.h" was added in the right spot in "OpensslLibCrypto.inf".)
> 
> Subsequently, when commit 9f4fbd56d430 ("CryptoPkg/OpensslLib: Update
> process_files.pl to generate .h files", 2019-10-30) re-generated that part
> of "OpensslLib.inf", the "ms/uplink.h" file reference was lost. This
> triggers a warning from the "build" utility now.
> 
> Name the header file in the right spot in [Sources].
> 
> This change makes "OpensslLib.inf" consistent with "OpensslLibCrypto.inf".
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> Fixes: 8906f076de35b222a7d62bcf6ed1a4a2498a5791
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>     Targeting edk2-stable201911.
> 
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 58202f83118d..3fa52f554320 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -23,6 +23,7 @@ [Defines]
> 
>  [Sources]
>    $(OPENSSL_PATH)/e_os.h
> +  $(OPENSSL_PATH)/ms/uplink.h
>  # Autogenerated files list starts here
>    $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
>    $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
> --
> 2.19.1.3.g30247aa5d201
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#51064): https://edk2.groups.io/g/devel/message/51064
Mute This Topic: https://groups.io/mt/61075474/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 3/3] CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"
Posted by Philippe Mathieu-Daudé 6 years, 2 months ago 
On 11/21/19 10:38 AM, Laszlo Ersek via Groups.Io wrote:
> Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in
> INF file", 2019-08-16) incorrectly placed "ms/uplink.h" in the
> auto-generated part of [Sources], in "OpensslLib.inf".
> 
> ("ms/uplink.h" was added in the right spot in "OpensslLibCrypto.inf".)
> 
> Subsequently, when commit 9f4fbd56d430 ("CryptoPkg/OpensslLib: Update
> process_files.pl to generate .h files", 2019-10-30) re-generated that part
> of "OpensslLib.inf", the "ms/uplink.h" file reference was lost. This
> triggers a warning from the "build" utility now.
> 
> Name the header file in the right spot in [Sources].
> 
> This change makes "OpensslLib.inf" consistent with "OpensslLibCrypto.inf".
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> Fixes: 8906f076de35b222a7d62bcf6ed1a4a2498a5791
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>      Targeting edk2-stable201911.
> 
>   CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 58202f83118d..3fa52f554320 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -23,6 +23,7 @@ [Defines]
>   
>   [Sources]
>     $(OPENSSL_PATH)/e_os.h
> +  $(OPENSSL_PATH)/ms/uplink.h
>   # Autogenerated files list starts here
>     $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
>     $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#51082): https://edk2.groups.io/g/devel/message/51082
Mute This Topic: https://groups.io/mt/61075474/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.