Made more of unpack() common. Use wildcards to pick up different compression types.

1 files changed, 12 insertions, 20 deletions

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 46724fd..fa6d103 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -57,8 +57,9 @@ function log {
 
 # Unpack an archive
 function unpack {
+    log Unpacking $*
     # Use 'auto' mode decompression.  Replace with a switch if tar doesn't support -a
-    tar xvaf $1
+    tar xvaf ${SOURCES}/$1.tar.*
 }
 
 # Install a build
@@ -90,7 +91,7 @@ mkdir -p ${STAMPS} ${SOURCES}
 cd ${SOURCES}
 
 fetch ${BINUTILS} http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
-fetch ${GCC} ${GCC_URL}
+fetch ${GCC} http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
 fetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
 fetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
 
@@ -145,8 +146,7 @@ if [ ! -e build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
-    log "Unpacking ${BINUTILS}"
-    unpack ${SOURCES}/${BINUTILS}.tar.bz2
+    unpack ${BINUTILS}
     cd build
     log "Configuring ${BINUTILS}"
     ../${BINUTILS}/configure --target=${TARGET} \
@@ -168,8 +168,7 @@ if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
-    log "Unpacking ${GCC}-boot"
-    unpack ${SOURCES}/${GCC}.tar.bz2
+    unpack ${GCC} boot
     cd build
     log "Configuring ${GCC}-boot"
     ../${GCC}/configure --target=${TARGET} \
@@ -195,8 +194,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
-    log "Unpacking ${NEWLIB}"
-    unpack ${SOURCES}/${NEWLIB}.tar.gz
+    unpack ${NEWLIB}
     cd build
     log "Configuring ${NEWLIB}"
     ../${NEWLIB}/configure --target=${TARGET} \
@@ -219,8 +217,7 @@ fi
 
 # Yes, you need to build gcc again!
 if [ ! -e ${STAMPS}/${GCC}.build ]; then
-    log "Unpacking ${GCC}"
-    unpack ${SOURCES}/${GCC}.tar.bz2
+    unpack ${GCC}
     cd build
     log "Configuring ${GCC}"
     ../${GCC}/configure --target=${TARGET} \
@@ -245,8 +242,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${GDB}.build ]; then
-    log "Unpacking ${GDB}"
-    unpack ${SOURCES}/${GDB}.tar.bz2
+    unpack ${GDB}
     cd build
     log "Configuring ${GDB}"
     ../${GDB}/configure --target=${TARGET} \
@@ -266,8 +262,7 @@ fi
 
 if [ ${LIBSTM32_EN} != 0 ]; then
 if [ ! -e .libcmsis-${LIBCMSIS}.build ]; then
-    log "Unpacking libcmsis-${LIBCMSIS}"
-    unpack ${SOURCES}/libcmsis-${LIBCMSIS}.tar.bz2
+    unpack libcmsis-${LIBCMSIS}
     cd libcmsis-${LIBCMSIS}
     log "Building libcmsis-${LIBCMSIS}"
     make arch_prefix=${TARGET} prefix=${PREFIX}
@@ -279,8 +274,7 @@ if [ ! -e .libcmsis-${LIBCMSIS}.build ]; then
 fi
 
 if [ ! -e .libstm32-${LIBSTM32}.build ]; then
-    log "Unpacking libstm32-${LIBSTM32}"
-    unpack ${SOURCES}/libstm32-${LIBSTM32}.tar.bz2
+    unpack libstm32-${LIBSTM32}
     cd libstm32-${LIBSTM32}
     log "Building libstm32-${LIBSTM32}"
     make arch_prefix=${TARGET} prefix=${PREFIX}
@@ -292,8 +286,7 @@ if [ ! -e .libstm32-${LIBSTM32}.build ]; then
 fi
 
 if [ ! -e .libstm32usb-${LIBSTM32USB}.build ]; then
-    log "Unpacking libstm32usb-${LIBSTM32USB}"
-    unpack ${SOURCES}/libstm32usb-${LIBSTM32USB}.tar.bz2
+    unpack libstm32usb-${LIBSTM32USB}
     cd libstm32usb-${LIBSTM32USB}
     log "Building libstm32usb-${LIBSTM32USB}"
     make arch_prefix=${TARGET} prefix=${PREFIX}
@@ -306,8 +299,7 @@ fi
 fi
 
 if [ $LIBOPENSTM32_EN != 0 ]; then
-    log "Unpacking libopenstm32-${LIBOPENSTM32}"
-    unpack ${SOURCES}/libopenstm32-${LIBOPENSTM32}.tar.bz2
+    unpack libopenstm32-${LIBOPENSTM32}
     cd libopenstm32-${LIBOPENSTM32}
     log "Building libopenstm32-${LIBOPENSTM32}"
     make PREFIX=${TARGET} DESTDIR=${PREFIX}