Skip to content

Commit

Permalink
pull up r25395 from trunk
Browse files Browse the repository at this point in the history
 ------------------------------------------------------------------------
 r25395 | tlyu | 2011-10-21 13:35:49 -0400 (Fri, 21 Oct 2011) | 10 lines

 ticket: 6989
 subject: fix tar invocation in mkrel
 target_version: 1.10
 tags: pullup

 Fix the tar invocation in mkrel so that it defaults to using "tar" as
 the tar program rather than "gtar".

 This should probably be pulled up to at least 1.9 and 1.8 as well.

ticket: 6989
version_fixed: 1.10
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25399 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information
tlyu committed Oct 21, 2011
1 parent b7e9738 commit 902013e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/util/mkrel
Expand Up @@ -5,6 +5,7 @@ dodoc=t
dosrc=t
checkout=t
multitar=nil
: ${TAR=tar}
while test $# -gt 2; do
case $1 in
--srconly)
Expand Down Expand Up @@ -207,22 +208,22 @@ if test $multitar = t; then
then notice=$reldir/NOTICE
fi
if test $dosrc = t; then
gtar --exclude $reldir/src/lib/crypto \
$TAR --exclude $reldir/src/lib/crypto \
--exclude $reldir/src/lib/des425 \
--exclude $reldir/doc \
-zcf ${reldir}.src.tar.gz $reldir

gtar zcf ${reldir}.crypto.tar.gz \
$TAR zcf ${reldir}.crypto.tar.gz \
$reldir/src/lib/crypto \
$des425
fi
if test $dodoc = t; then
gtar zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README $notice
$TAR zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README $notice
fi
ls -l ${reldir}.*.tar.gz
fi

gtar zcf ${reldir}.tar.gz $reldir
$TAR zcf ${reldir}.tar.gz $reldir
ls -l ${reldir}.tar.gz

echo "Done."
Expand Down

0 comments on commit 902013e

Please sign in to comment.