[edk2] [PATCH] CryptoPkg: add .gitignore for OpenSSL source files

[Ard Biesheuvel]

Add a .gitignore that masks the OpenSSL header files under
Include/openssl and the OpenSSL source files under
Library/OpensslLib/openssl-*. This prevents Git from considering
any of these files for addition, and prevents other clutter in
the git status output.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <***@linaro.org>
---
CryptoPkg/.gitignore | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 CryptoPkg/.gitignore

diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore
new file mode 100644
index 000000000000..05272c286525
--- /dev/null
+++ b/CryptoPkg/.gitignore
@@ -0,0 +1,2 @@
+Include/openssl
+Library/OpensslLib/openssl-*/

[Long, Qin]

This looks good.

Reviewed-by: Qin Long <***@intel.com>


Best Regards & Thanks,
LONG, Qin

-----Original Message-----
From: Ard Biesheuvel [mailto:***@linaro.org]
Sent: Tuesday, June 16, 2015 8:58 PM
To: edk2-***@lists.sourceforge.net; Long, Qin
Cc: ***@redhat.com; Ard Biesheuvel
Subject: [PATCH] CryptoPkg: add .gitignore for OpenSSL source files

Add a .gitignore that masks the OpenSSL header files under Include/openssl and the OpenSSL source files under Library/OpensslLib/openssl-*. This prevents Git from considering any of these files for addition, and prevents other clutter in the git status output.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <***@linaro.org>
---
CryptoPkg/.gitignore | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 CryptoPkg/.gitignore

diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore new file mode 100644 index 000000000000..05272c286525
--- /dev/null
+++ b/CryptoPkg/.gitignore
@@ -0,0 +1,2 @@
+Include/openssl
+Library/OpensslLib/openssl-*/
--
1.9.1


------------------------------------------------------------------------------

[Ard Biesheuvel]

Post by Long, Qin
This looks good.

Committed as r17647

Thanks,
Ard.

Post by Long, Qin
-----Original Message-----
Sent: Tuesday, June 16, 2015 8:58 PM
Subject: [PATCH] CryptoPkg: add .gitignore for OpenSSL source files
Add a .gitignore that masks the OpenSSL header files under Include/openssl and the OpenSSL source files under Library/OpensslLib/openssl-*. This prevents Git from considering any of these files for addition, and prevents other clutter in the git status output.
Contributed-under: TianoCore Contribution Agreement 1.0
---
CryptoPkg/.gitignore | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 CryptoPkg/.gitignore
diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore new file mode 100644 index 000000000000..05272c286525
--- /dev/null
+++ b/CryptoPkg/.gitignore
@@ -0,0 +1,2 @@
+Include/openssl
+Library/OpensslLib/openssl-*/
--
1.9.1

------------------------------------------------------------------------------

[Laszlo Ersek]

Post by Ard Biesheuvel
Add a .gitignore that masks the OpenSSL header files under
Include/openssl and the OpenSSL source files under
Library/OpensslLib/openssl-*. This prevents Git from considering
any of these files for addition, and prevents other clutter in
the git status output.
Contributed-under: TianoCore Contribution Agreement 1.0
---
CryptoPkg/.gitignore | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 CryptoPkg/.gitignore
diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore
new file mode 100644
index 000000000000..05272c286525
--- /dev/null
+++ b/CryptoPkg/.gitignore
@@ -0,0 +1,2 @@
+Include/openssl
+Library/OpensslLib/openssl-*/

Reviewed-by: Laszlo Ersek <***@redhat.com>

Truth to be told, in my local clone, in my "base_config" branch (on top
of which I always develop the feature branches) I always keep a commit
called

setup build environment for secure boot support

which is a commit that simply captures the effects of
"CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt". Such a commit makes it
very easy to rebase the "base_config" branch (and my dependent feature
branches) on top of a refreshed master. (Of course when edk2 updates
OpenSSL then I have to redo this commit, but it's pretty simple, and I
do notice such OpenSSL updates when I pull master.)

So, this CryptoPkg/.gitignore patch will interfere with that local
commit of mine, but that's not a problem: I can just revert this
upstream commit in my "base_config" branch, in the same (or one earlier)
commit that captures the OpenSSL tree. Hence my R-b.

Thanks
Laszlo

------------------------------------------------------------------------------

[Ard Biesheuvel]

Post by Laszlo Ersek

Post by Ard Biesheuvel
Add a .gitignore that masks the OpenSSL header files under
Include/openssl and the OpenSSL source files under
Library/OpensslLib/openssl-*. This prevents Git from considering
any of these files for addition, and prevents other clutter in
the git status output.
Contributed-under: TianoCore Contribution Agreement 1.0
---
CryptoPkg/.gitignore | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 CryptoPkg/.gitignore
diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore
new file mode 100644
index 000000000000..05272c286525
--- /dev/null
+++ b/CryptoPkg/.gitignore
@@ -0,0 +1,2 @@
+Include/openssl
+Library/OpensslLib/openssl-*/

Thanks.

Post by Laszlo Ersek
Truth to be told, in my local clone, in my "base_config" branch (on top
of which I always develop the feature branches) I always keep a commit
called
setup build environment for secure boot support
which is a commit that simply captures the effects of
"CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt". Such a commit makes it
very easy to rebase the "base_config" branch (and my dependent feature
branches) on top of a refreshed master. (Of course when edk2 updates
OpenSSL then I have to redo this commit, but it's pretty simple, and I
do notice such OpenSSL updates when I pull master.)

I think the OpenSSL dependency would be a suitable candidate for being
incorporated as a git submodule, whose upstream repo has these changes
pre-applied instead of relying on the howto, the .diff and the install
scripts (unless there are legal concerns, of course).
We could simply branch off the OpenSSL_1_0_2-stable branch, apply our
changes and merge upstream changes periodically. The core EDK2 repo
could just jump from one stable state to the next.

Post by Laszlo Ersek
So, this CryptoPkg/.gitignore patch will interfere with that local
commit of mine, but that's not a problem: I can just revert this
upstream commit in my "base_config" branch, in the same (or one earlier)
commit that captures the OpenSSL tree. Hence my R-b.

OK, glad that it works for you