From fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 Mon Sep 17 00:00:00 2001 From: Heiko Abraham Date: Sat, 31 May 2014 00:10:38 +0200 Subject: [PATCH] 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: Heiko Abraham Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- support/dependencies/check-host-tar.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/support/dependencies/check-host-tar.sh b/support/dependencies/check-host-tar.sh index 2cfc2b3cc..932d3c4fb 100755 --- a/support/dependencies/check-host-tar.sh +++ b/support/dependencies/check-host-tar.sh @@ -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).