[PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911

[PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911

[Laszlo Ersek]

Repo:              https://github.com/lersek/edk2.git
Branch:            local_hdrs
Personal CI build: https://github.com/tianocore/edk2/pull/188

I'm proposing this small set of fixes for edk2-stable201911.

If the consensus is that they should be delayed until after
edk2-stable201911, I'm OK with that too.

Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Shenglei Zhang <shenglei.zhang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>

Thanks
Laszlo

Laszlo Ersek (3):
  MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h"
  CryptoPkg/OpensslLib: improve INF file consistency
  CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"

 CryptoPkg/Library/OpensslLib/OpensslLib.inf                          | 6 +++---
 MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
2.19.1.3.g30247aa5d201

[PATCH 1/3] MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h"

[Laszlo Ersek]

Commit aab3b9b9a1e5 ("MdeModulePkg/Variable: Add RT GetVariable() cache
support", 2019-11-05) added "VariableParsing.h" to
"VariableSmmRuntimeDxe.inf".

"VariableParsing.h" includes "Variable.h", so the "build" utility is right
to warn us that "Variable.h" should be listed in [Sources] too.

Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Fixes: aab3b9b9a1e5e1f3fa966fb1667fc3e6c47e7706
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    Targeting edk2-stable201911.

 MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
index a250533a534f..592862773390 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
@@ -41,6 +41,7 @@ [Sources]
   Measurement.c
   VariableParsing.c
   VariableParsing.h
+  Variable.h
 
 [Packages]
   MdePkg/MdePkg.dec
-- 
2.19.1.3.g30247aa5d201

[PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency

[Laszlo Ersek]

When diffing "OpensslLib.inf" against "OpensslLibCrypto.inf", the *only*
differences should be:

- BASE_NAME, MODULE_UNI_FILE, and FILE_GUID are expected to differ, in
  [Defines];

- "OpensslLib.inf" is expected to list "$(OPENSSL_PATH)/ssl/..." source
  files in the auto-generated part of the [Sources] section.

Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in
INF file", 2019-08-16) broke that invariant, by adding "buildinf.h" and
"rand_pool_noise.h" in different order to both INF files.

Fix that order in "OpensslLib.inf" now. (Note that this does not
re-establish full consistency between both INF files -- it just highlights
another problem, which we'll fix in the next patch.)

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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 44e050f08d46..58202f83118d 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -22,8 +22,6 @@ [Defines]
 #
 
 [Sources]
-  buildinf.h
-  rand_pool_noise.h
   $(OPENSSL_PATH)/e_os.h
 # Autogenerated files list starts here
   $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
@@ -598,7 +596,8 @@ [Sources]
   $(OPENSSL_PATH)/ssl/record/record.h
   $(OPENSSL_PATH)/ssl/record/record_locl.h
 # Autogenerated files list ends here
-
+  buildinf.h
+  rand_pool_noise.h
   ossl_store.c
   rand_pool.c
 
-- 
2.19.1.3.g30247aa5d201

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

[Laszlo Ersek]

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

Re: [PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911

[Leif Lindholm]

On Thu, Nov 21, 2019 at 10:38:30AM +0100, Laszlo Ersek wrote:
> Repo:              https://github.com/lersek/edk2.git
> Branch:            local_hdrs
> Personal CI build: https://github.com/tianocore/edk2/pull/188
> 
> I'm proposing this small set of fixes for edk2-stable201911.
> 
> If the consensus is that they should be delayed until after
> edk2-stable201911, I'm OK with that too.

For the series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

But unless this addresses an actual build failure in some setup (and I
don't see how it could), please defer until after stable tag.

Best Regards,

Leif

> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (3):
>   MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h"
>   CryptoPkg/OpensslLib: improve INF file consistency
>   CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"
> 
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf                          | 6 +++---
>  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf | 1 +
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> -- 
> 2.19.1.3.g30247aa5d201
> 

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

[Wang, Jian J]

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
> 
> 
> 

Re: [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency

[Wang, Jian J]

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

Regards,
Jian

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> 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: [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency
> 
> When diffing "OpensslLib.inf" against "OpensslLibCrypto.inf", the *only*
> differences should be:
> 
> - BASE_NAME, MODULE_UNI_FILE, and FILE_GUID are expected to differ, in
>   [Defines];
> 
> - "OpensslLib.inf" is expected to list "$(OPENSSL_PATH)/ssl/..." source
>   files in the auto-generated part of the [Sources] section.
> 
> Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in
> INF file", 2019-08-16) broke that invariant, by adding "buildinf.h" and
> "rand_pool_noise.h" in different order to both INF files.
> 
> Fix that order in "OpensslLib.inf" now. (Note that this does not
> re-establish full consistency between both INF files -- it just highlights
> another problem, which we'll fix in the next patch.)
> 
> 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 | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 44e050f08d46..58202f83118d 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -22,8 +22,6 @@ [Defines]
>  #
> 
>  [Sources]
> -  buildinf.h
> -  rand_pool_noise.h
>    $(OPENSSL_PATH)/e_os.h
>  # Autogenerated files list starts here
>    $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
> @@ -598,7 +596,8 @@ [Sources]
>    $(OPENSSL_PATH)/ssl/record/record.h
>    $(OPENSSL_PATH)/ssl/record/record_locl.h
>  # Autogenerated files list ends here
> -
> +  buildinf.h
> +  rand_pool_noise.h
>    ossl_store.c
>    rand_pool.c
> 
> --
> 2.19.1.3.g30247aa5d201
> 

Re: [edk2-devel] [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency

[Philippe Mathieu-Daudé]

On 11/21/19 10:38 AM, Laszlo Ersek via Groups.Io wrote:
> When diffing "OpensslLib.inf" against "OpensslLibCrypto.inf", the *only*
> differences should be:
> 
> - BASE_NAME, MODULE_UNI_FILE, and FILE_GUID are expected to differ, in
>    [Defines];
> 
> - "OpensslLib.inf" is expected to list "$(OPENSSL_PATH)/ssl/..." source
>    files in the auto-generated part of the [Sources] section.
> 
> Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in
> INF file", 2019-08-16) broke that invariant, by adding "buildinf.h" and
> "rand_pool_noise.h" in different order to both INF files.
> 
> Fix that order in "OpensslLib.inf" now. (Note that this does not
> re-establish full consistency between both INF files -- it just highlights
> another problem, which we'll fix in the next patch.)
> 
> 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 | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 44e050f08d46..58202f83118d 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -22,8 +22,6 @@ [Defines]
>   #
>   
>   [Sources]
> -  buildinf.h
> -  rand_pool_noise.h
>     $(OPENSSL_PATH)/e_os.h
>   # Autogenerated files list starts here
>     $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
> @@ -598,7 +596,8 @@ [Sources]
>     $(OPENSSL_PATH)/ssl/record/record.h
>     $(OPENSSL_PATH)/ssl/record/record_locl.h
>   # Autogenerated files list ends here
> -
> +  buildinf.h
> +  rand_pool_noise.h
>     ossl_store.c
>     rand_pool.c
>   
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
(safe for edk2-stable201911 IMHO)

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

[Philippe Mathieu-Daudé]

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>

Re: [edk2-devel] [PATCH 1/3] MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h"

[Philippe Mathieu-Daudé]

On 11/21/19 10:38 AM, Laszlo Ersek via Groups.Io wrote:
> Commit aab3b9b9a1e5 ("MdeModulePkg/Variable: Add RT GetVariable() cache
> support", 2019-11-05) added "VariableParsing.h" to
> "VariableSmmRuntimeDxe.inf".
> 
> "VariableParsing.h" includes "Variable.h", so the "build" utility is right
> to warn us that "Variable.h" should be listed in [Sources] too.
> 
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Fixes: aab3b9b9a1e5e1f3fa966fb1667fc3e6c47e7706
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>      Targeting edk2-stable201911.
> 
>   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> index a250533a534f..592862773390 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> @@ -41,6 +41,7 @@ [Sources]
>     Measurement.c
>     VariableParsing.c
>     VariableParsing.h
> +  Variable.h
>   
>   [Packages]
>     MdePkg/MdePkg.dec
> 

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

Re: [PATCH 1/3] MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h"

[Wang, Jian J]

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

Regards,
Jian

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Thursday, November 21, 2019 5:39 PM
> To: edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Leif Lindholm <leif.lindholm@linaro.org>; Gao, Liming <liming.gao@intel.com>;
> Kubacki, Michael A <michael.a.kubacki@intel.com>
> Subject: [PATCH 1/3] MdeModulePkg/VariableSmmRuntimeDxe.inf: list local
> header "Variable.h"
> 
> Commit aab3b9b9a1e5 ("MdeModulePkg/Variable: Add RT GetVariable() cache
> support", 2019-11-05) added "VariableParsing.h" to
> "VariableSmmRuntimeDxe.inf".
> 
> "VariableParsing.h" includes "Variable.h", so the "build" utility is right
> to warn us that "Variable.h" should be listed in [Sources] too.
> 
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Fixes: aab3b9b9a1e5e1f3fa966fb1667fc3e6c47e7706
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>     Targeting edk2-stable201911.
> 
>  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf |
> 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git
> a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> index a250533a534f..592862773390 100644
> ---
> a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> +++
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> @@ -41,6 +41,7 @@ [Sources]
>    Measurement.c
>    VariableParsing.c
>    VariableParsing.h
> +  Variable.h
> 
>  [Packages]
>    MdePkg/MdePkg.dec
> --
> 2.19.1.3.g30247aa5d201
> 

Re: [PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911

[Laszlo Ersek]

On 11/21/19 11:00, Leif Lindholm wrote:
> On Thu, Nov 21, 2019 at 10:38:30AM +0100, Laszlo Ersek wrote:
>> Repo:              https://github.com/lersek/edk2.git
>> Branch:            local_hdrs
>> Personal CI build: https://github.com/tianocore/edk2/pull/188
>>
>> I'm proposing this small set of fixes for edk2-stable201911.
>>
>> If the consensus is that they should be delayed until after
>> edk2-stable201911, I'm OK with that too.
> 
> For the series:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Thanks!

> 
> But unless this addresses an actual build failure in some setup (and I
> don't see how it could), please defer until after stable tag.

Right, this only triggers warnings from "build", which are meant to be
informative. No build is actually broken, to my knowledge. So I'll
postpone pushing the series. (I still need pkg maintainer feedback anyway.)

Thanks!
Laszlo

> 
> Best Regards,
> 
> Leif
> 
>> Cc: Hao A Wu <hao.a.wu@intel.com>
>> Cc: Jian J Wang <jian.j.wang@intel.com>
>> Cc: Leif Lindholm <leif.lindholm@linaro.org>
>> Cc: Liming Gao <liming.gao@intel.com>
>> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
>> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
>> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
>>
>> Thanks
>> Laszlo
>>
>> Laszlo Ersek (3):
>>   MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h"
>>   CryptoPkg/OpensslLib: improve INF file consistency
>>   CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"
>>
>>  CryptoPkg/Library/OpensslLib/OpensslLib.inf                          | 6 +++---
>>  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf | 1 +
>>  2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> -- 
>> 2.19.1.3.g30247aa5d201
>>
> 

Re: [edk2-devel] [PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911

[Laszlo Ersek]

On 11/21/19 10:38, Laszlo Ersek via Groups.Io wrote:
> Repo:              https://github.com/lersek/edk2.git
> Branch:            local_hdrs
> Personal CI build: https://github.com/tianocore/edk2/pull/188
> 
> I'm proposing this small set of fixes for edk2-stable201911.
> 
> If the consensus is that they should be delayed until after
> edk2-stable201911, I'm OK with that too.
> 
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (3):
>   MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h"
>   CryptoPkg/OpensslLib: improve INF file consistency
>   CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h"
> 
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf                          | 6 +++---
>  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf | 1 +
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 

Pushed as commit range bd85bf54c268..4d613feee57e via
<https://github.com/tianocore/edk2/pull/200>.

Thanks
Laszlo