Stop using tardy
Instead of piping through tardy, and possibly suffering from bugs in certain versions, use --transform, --owner and --group directly with GNU tar (we already expect that tar variant). Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
parent
2fc52c912a
commit
27f98436b9
31
Makefile.org
31
Makefile.org
@ -481,25 +481,28 @@ TABLE: Configure Configurations/*.conf
|
|||||||
# would occur. Therefore the list of files is temporarily stored into a file
|
# would occur. Therefore the list of files is temporarily stored into a file
|
||||||
# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
|
# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
|
||||||
# tar does not support the --files-from option.
|
# tar does not support the --files-from option.
|
||||||
tar:
|
TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
|
||||||
|
--owner openssl --group openssl \
|
||||||
|
--transform 's|^|openssl-$(VERSION)/|' \
|
||||||
|
-cvf -
|
||||||
|
|
||||||
|
../$(TARFILE).list:
|
||||||
|
find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
|
||||||
|
\! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \
|
||||||
|
\! -name '*test' \! -name '.#*' \! -name '*~' \
|
||||||
|
| sort > ../$(TARFILE).list
|
||||||
|
|
||||||
|
tar: ../$(TARFILE).list
|
||||||
find . -type d -print | xargs chmod 755
|
find . -type d -print | xargs chmod 755
|
||||||
find . -type f -print | xargs chmod a+r
|
find . -type f -print | xargs chmod a+r
|
||||||
find . -type f -perm -0100 -print | xargs chmod a+x
|
find . -type f -perm -0100 -print | xargs chmod a+x
|
||||||
find * \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
|
$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
|
||||||
$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
|
rm -f ../$(TARFILE).list
|
||||||
tardy --user_number=0 --user_name=openssl \
|
|
||||||
--group_number=0 --group_name=openssl \
|
|
||||||
--prefix=openssl-$(VERSION) - |\
|
|
||||||
gzip --best >../$(TARFILE).gz; \
|
|
||||||
rm -f ../$(TARFILE).list; \
|
|
||||||
ls -l ../$(TARFILE).gz
|
ls -l ../$(TARFILE).gz
|
||||||
|
|
||||||
tar-snap:
|
tar-snap: ../$(TARFILE).list
|
||||||
@$(TAR) $(TARFLAGS) -cvf - \
|
$(TAR_COMMAND) > ../$(TARFILE)
|
||||||
`find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
|
rm -f ../$(TARFILE).list
|
||||||
tardy --user_number=0 --user_name=openssl \
|
|
||||||
--group_number=0 --group_name=openssl \
|
|
||||||
--prefix=openssl-$(VERSION) - > ../$(TARFILE);\
|
|
||||||
ls -l ../$(TARFILE)
|
ls -l ../$(TARFILE)
|
||||||
|
|
||||||
dist:
|
dist:
|
||||||
|
Loading…
Reference in New Issue
Block a user