From 176e2bddb45b417b0bfbcdcd95bd5e81505e1e5b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 23 Jan 2016 00:59:55 +1300 Subject: toolchain-shar-extract.sh: improve behaviour when xz is not installed Currently if xz isn't installed when installing the SDK you get an error from tar and then the SDK installation continues, cascading into a load of other failures since files are missing. Add a check to see if xz can be run and error out if it can't, and also exit if tar fails. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index b1ef4b7668..d844771de0 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -29,6 +29,11 @@ if [ "$INST_ARCH" != "$SDK_ARCH" ]; then fi fi +if ! xz -V > /dev/null 2>&1; then + echo "Error: xz is required for installation of this SDK, please install it first" + exit 1 +fi + DEFAULT_INSTALL_DIR="@SDKPATH@" SUDO_EXEC="" target_sdk_dir="" @@ -168,7 +173,7 @@ fi payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1)) printf "Extracting SDK..." -tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 +tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 || exit 1 echo "done" printf "Setting it up..." -- cgit 1.2.3-korg