diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CryptoPkg/.gitignore | 1 | ||||
| -rw-r--r-- | CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt | 29 | ||||
| m--------- | CryptoPkg/Library/OpensslLib/openssl | 0 |
4 files changed, 18 insertions, 15 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..e4ae0c1c16 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "CryptoPkg/Library/OpensslLib/openssl"] + path = CryptoPkg/Library/OpensslLib/openssl + url = https://github.com/openssl/openssl diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore deleted file mode 100644 index 731c275ae1..0000000000 --- a/CryptoPkg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Library/OpensslLib/openssl*/
diff --git a/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt b/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt index d152138129..ac63d4c077 100644 --- a/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt +++ b/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt @@ -25,21 +25,22 @@ on the cryptography. =============================================================================
HOW to Install OpenSSL for UEFI Building
=============================================================================
-1. Clone the latest official OpenSSL release into the directory
- CryptoPkg/Library/OpensslLib/openssl/
+ OpenSSL repository was added as one submodule of EDKII project.
- Use OpenSSL-1.1.0g release as one example:
- (OpenSSL_1_1_0g below is the tag name for the OpenSSL-1.1.0g release)
- > cd CryptoPkg/Library/OpensslLib
- > git clone -b OpenSSL_1_1_0g https://github.com/openssl/openssl openssl
- or
- > git clone https://github.com/openssl/openssl openssl
- > git checkout OpenSSL_1_1_0g
-Or
-2. Download the latest OpenSSL release package from the official website:
- https://www.openssl.org/source/
- and unpack the OpenSSL source into:
- CryptoPkg/Library/OpensslLib/openssl/
+ The user can use the following commands to clone both main EDKII repo and
+openssl submodule:
+ 1) Add the "--recursive" flag to the git clone command:
+ $ git clone --recursive https://github.com/tianocore/edk2
+or
+ 2) Manually initialize and update the submodules after the clone operation
+ on main project:
+ $ git clone https://github.com/tianocore/edk2
+ $ git submodule update --init --recursive
+
+ And use the following combined commands to pull the remote submodule updates
+(e.g. Updating the new supported OpenSSL release tag):
+ $ git pull --recurse-submodules && \
+ git submodule update --recursive --remote
=============================================================================
About process_files.pl
diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/OpensslLib/openssl new file mode 160000 +Subproject b2758a2292aceda93e9f44c219b94fe21bb9a65 |