[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 5caffa1aa037ba060ffddfd0171e596bbe1feb6b

[Luca Capello]

The following commit has been merged in the master branch:
commit 5caffa1aa037ba060ffddfd0171e596bbe1feb6b
Author: Luca Capello <luca at pca.it>
Date:   Wed Feb 4 13:53:03 2009 +0100

    install.sh: add check for gzip support in tar
    
    Thanks to Bruce Cran <bruce at cran.org.uk> for the patch.

diff --git a/install.sh b/install.sh
index a5fcb9b..e0bb3f0 100755
--- a/install.sh
+++ b/install.sh
@@ -73,6 +73,9 @@ UBOOT_ENV_SIZE=262144
 # mkfs.vfat is not installed by default in most of the Openmoko images
 DOSFSTOOLS_PACKAGE=$INST_MIRROR/pool/main/d/dosfstools/dosfstools_3.0.1-1_armel.deb
 
+# FSO-MS5 busybox's tar does not support -z
+TAR_PACKAGE=$INST_MIRROR/pool/main/t/tar/tar_1.20-1_armel.deb
+
 
 #
 # FUNCTIONS
@@ -298,6 +301,17 @@ for BINARY in wget ping fdisk mount umount mkfs.ext2 gunzip dd sed rdate; do
 	echo " * $BINARY installed"
 done
 
+if tar --help 2>&1 | grep "Usage: tar \-\[cxtvO\]" >/dev/null; then
+	echo "W: tar does not support gzip archives"
+	echo "Downloading tar package"
+	wget $TAR_PACKAGE -O /tmp/tar.deb
+	( cd /tmp; ar -x tar.deb data.tar.gz )
+	mkdir -p /usr/local
+	gunzip -c /tmp/data.tar.gz | tar -x -C /usr/local/
+	rm -f /tmp/data.tar.gz
+	rm -f /tmp/tar.deb
+fi
+
 if [ "$SD_PART1_FS" = "vfat" ]; then
 	if ! which mkfs.vfat >/dev/null; then
 		echo "W: Could not find mkfs.vfat binary"

-- 
Various non-packaged files