public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Laszlo Ersek" <lersek@redhat.com>
To: edk2-devel-groups-io <devel@edk2.groups.io>
Cc: Jian J Wang <jian.j.wang@intel.com>,
	Leif Lindholm <leif.lindholm@linaro.org>,
	Shenglei Zhang <shenglei.zhang@intel.com>,
	Xiaoyu Lu <xiaoyux.lu@intel.com>
Subject: [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency
Date: Thu, 21 Nov 2019 10:38:32 +0100	[thread overview]
Message-ID: <20191121093833.13840-3-lersek@redhat.com> (raw)
In-Reply-To: <20191121093833.13840-1-lersek@redhat.com>

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



  parent reply	other threads:[~2019-11-21  9:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-21  9:38 [PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911 Laszlo Ersek
2019-11-21  9:38 ` [PATCH 1/3] MdeModulePkg/VariableSmmRuntimeDxe.inf: list local header "Variable.h" Laszlo Ersek
2019-11-21 15:53   ` [edk2-devel] " Philippe Mathieu-Daudé
2019-11-21 15:55   ` Wang, Jian J
2019-11-21  9:38 ` Laszlo Ersek [this message]
2019-11-21 14:44   ` [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency Wang, Jian J
2019-11-21 15:48   ` [edk2-devel] " Philippe Mathieu-Daudé
2019-11-21  9:38 ` [PATCH 3/3] CryptoPkg/OpensslLib.inf: list OpenSSL local header "ms/uplink.h" Laszlo Ersek
2019-11-21 14:43   ` [edk2-devel] " Wang, Jian J
2019-11-21 15:51   ` Philippe Mathieu-Daudé
2019-11-21 10:00 ` [PATCH 0/3] local header listing fixes for INF files, for edk2-stable201911 Leif Lindholm
2019-11-21 16:07   ` Laszlo Ersek
2019-12-02 20:23 ` [edk2-devel] " Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191121093833.13840-3-lersek@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox