The branch OpenSSL_1_1_0-stable has been updated
via f48e792f1b2178c629fad6b23d15e9ec01535d43 (commit)
via 70c0b541b940349a0cfdc903f4491aa55f6fda0c (commit)
via a50c4aa6d7b02c1e5703da61d0c9302f8a7f0e45 (commit)
from 5dd8e67a7b9ede8d90744660abbb40adf07890aa (commit)
- Log -----------------------------------------------------------------
commit f48e792f1b2178c629fad6b23d15e9ec01535d43
Author: Richard Levitte <levi...@openssl.org>
Date: Thu Aug 17 14:08:43 2017 +0200
Add a comment on expectations in the "tar" target
Reviewed-by: Andy Polyakov <ap...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4179)
(cherry picked from commit 77a9c26e03ccfec8d16985bce79e95eb6dc2dd2e)
commit 70c0b541b940349a0cfdc903f4491aa55f6fda0c
Author: Richard Levitte <levi...@openssl.org>
Date: Thu Aug 17 14:04:36 2017 +0200
Prepare tarball in dist directory
We changed directory to the wrong directory.
This change also separates the preparation phase from the tarball
building phase.
Reviewed-by: Andy Polyakov <ap...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4179)
(cherry picked from commit 17c84aa763b1d69c5446542bf9b4e2f642c570f2)
commit a50c4aa6d7b02c1e5703da61d0c9302f8a7f0e45
Author: Richard Levitte <levi...@openssl.org>
Date: Thu Aug 17 14:04:18 2017 +0200
Turn on error sensitivity in the "tar" target
Reviewed-by: Andy Polyakov <ap...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4179)
(cherry picked from commit 34a5b7d727204eb990acd44899d457245ac94d7c)
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index e0853b1..c420e69 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -649,9 +649,12 @@ tags TAGS: FORCE
# Release targets (note: only available on Unix) #####################
+# If your tar command doesn't support --owner and --group, make sure to
+# use one that does, for example GNU tar
TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cvf -
PREPARE_CMD=:
tar:
+ set -e; \
TMPDIR=/var/tmp/openssl-copy.$$$$; \
DISTDIR=$(NAME); \
mkdir -p $$TMPDIR/$$DISTDIR; \
@@ -662,12 +665,12 @@ tar:
mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
cp $$F $$TMPDIR/$$DISTDIR/$$F; \
done); \
- (cd $$TMPDIR; \
+ (cd $$TMPDIR/$$DISTDIR; \
$(PREPARE_CMD); \
- find $$TMPDIR/$$DISTDIR -type d -print | xargs chmod 755; \
- find $$TMPDIR/$$DISTDIR -type f -print | xargs chmod a+r; \
- find $$TMPDIR/$$DISTDIR -type f -perm -0100 -print | xargs chmod a+x; \
- $(TAR_COMMAND) $$DISTDIR) \
+ find . -type d -print | xargs chmod 755; \
+ find . -type f -print | xargs chmod a+r; \
+ find . -type f -perm -0100 -print | xargs chmod a+x); \
+ (cd $$TMPDIR; $(TAR_COMMAND) $$DISTDIR) \
| (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \
rm -rf $$TMPDIR
cd $(SRCDIR); ls -l $(TARFILE).gz
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
