Not using -a option for tar anymore that was cousing too many problems.

[fw/cortex-toolchain] / summon-arm-toolchain

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 2a70d09b11c010c28c6007450d6b9eb07a4120e4..f4e7c47fff3858def73f55c4ea4679d529fd5bec 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -19,7 +19,7 @@ set -e
 # You probably want to customize those
 ##############################################################################
 TARGET=arm-none-eabi           # Or: TARGET=arm-elf
-PREFIX=${HOME}/arm-none-eabi   # Install location of your final toolchain
+PREFIX=${HOME}/sat     # Install location of your final toolchain
 PARALLEL=                      # Or: PARALLEL="-j 5" for 4 CPUs
 DARWIN_OPT_PATH=/opt/local     # Path in which MacPorts or Fink is installed
 # Set to 'sudo' if you need superuser privileges while installing
@@ -91,6 +91,35 @@ SUMMON_DIR=$(pwd)
 SOURCES=${SUMMON_DIR}/sources
 STAMPS=${SUMMON_DIR}/stamps
 
+
+##############################################################################
+# Tool section
+##############################################################################
+TAR=tar
+
+##############################################################################
+# OS and Tooldetection section
+# Detects which tools and flags to use
+##############################################################################
+
+case "$(uname)" in
+       Linux)
+       echo "Found Linux OS."
+       ;;
+       Darwin)
+       echo "Found Darwin OS."
+       GCCFLAGS="${GCCFLAGS} \
+                  --with-gmp=${DARWIN_OPT_PATH} \
+                 --with-mpfr=${DARWIN_OPT_PATH} \
+                 --with-mpc=${DARWIN_OPT_PATH} \
+                 -with-libiconv-prefix=${DARWIN_OPT_PATH}"
+       ;;
+       *)
+       echo "Found unknown OS. Aborting!"
+       exit 1
+       ;;
+esac
+
 ##############################################################################
 # Building section
 # You probably don't have to touch anything after this
@@ -116,7 +145,23 @@ function log {
 function unpack {
     log Unpacking $*
     # Use 'auto' mode decompression.  Replace with a switch if tar doesn't support -a
-    tar xaf${TARFLAGS} ${SOURCES}/$1.tar.*
+    ARCHIVE=$(ls ${SOURCES}/$1.tar.*)
+    case ${ARCHIVE} in
+       *.bz2)
+           echo "archive type bz2"
+           TYPE=j
+           ;;
+       *.gz)
+           echo "archive type gz"
+           TYPE=z
+           ;;
+       *)
+           echo "Unknown archive type of $1"
+           echo ${ARCHIVE}
+           exit 1
+           ;;
+    esac
+    ${TAR} xf${TYPE}${TARFLAGS} ${SOURCES}/$1.tar.*
 }
 
 # Install a build
@@ -125,23 +170,6 @@ function install {
     ${SUDO} make ${MAKEFLAGS} $2 $3 $4 $5 $6 $7 $8
 }
 
-case "$(uname)" in
-       Linux)
-       echo "Found Linux OS."
-       ;;
-       Darwin)
-       echo "Found Darwin OS."
-       GCCFLAGS="${GCCFLAGS} \
-                  --with-gmp=${DARWIN_OPT_PATH} \
-                 --with-mpfr=${DARWIN_OPT_PATH} \
-                 --with-mpc=${DARWIN_OPT_PATH} \
-                 -with-libiconv-prefix=${DARWIN_OPT_PATH}"
-       ;;
-       *)
-       echo "Found unknown OS. Aborting!"
-       exit 1
-       ;;
-esac
 
 mkdir -p ${STAMPS} ${SOURCES}