Commit fc90fa94 authored by Heiko Abraham's avatar Heiko Abraham Committed by Peter Korsgaard
Browse files

Improve tar check if bsdtar is installed 



If bsdtar is installed, fix script error for tar version detection.

bsdtar does not provide all expected command line (long) options
like "--hard-dereference". To ensure compatibility, mark version
of tar as 'invalid' and trigger build of 'host-tar'.

[Peter; slightly reworded commit text]
Signed-off-by: default avatarHeiko Abraham <abrahamh@web.de>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 36017b3d

support/dependencies/check-host-tar.sh

+7 −0
Original line number Diff line number Diff line
@@ -14,10 +14,17 @@ fi 
# Output of 'tar --version' examples:

# tar (GNU tar) 1.15.1

# tar (GNU tar) 1.25

# bsdtar 2.8.3 - libarchive 2.8.3

version=`$tar --version | head -n 1 | sed 's/^.*\s\([0-9]\+\.\S\+\).*$/\1/'`

major=`echo "$version" | cut -d. -f1`

minor=`echo "$version" | cut -d. -f2`

bugfix=`echo "$version" | cut -d. -f3`

version_bsd=`$tar --version | grep 'bsdtar'`

if [ ! -z "${version_bsd}" ] ; then 

  # mark as invalid version - not all command line options are available

  major=0

  minor=0

fi



# Minimal version = 1.17 (previous versions do not correctly unpack archives

# containing hard-links if the --strip-components option is used).