3 files changed, 33 insertions, 3 deletions
diff --git a/packages/zaurus-updater/files/gnu-tar.gz b/packages/zaurus-updater/files/gnu-tar.gz
new file mode 100644
index 0000000000..93d1a43704
--- /dev/null
+++ b/packages/zaurus-updater/files/gnu-tar.gz
diff --git a/packages/zaurus-updater/spitz/updater.sh b/packages/zaurus-updater/spitz/updater.sh
index 73aa12c9a7..a0483a1371 100755
--- a/packages/zaurus-updater/spitz/updater.sh
+++ b/packages/zaurus-updater/spitz/updater.sh
@@ -82,7 +82,7 @@ fi
 ### Check model ###
 /sbin/writerominfo
 MODEL=`cat /proc/deviceinfo/product`
-if [ "$MODEL" != "SL-C3000" ]
+if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ]
 then
 	echo 'MODEL:'$MODEL
 	echo 'ERROR:Invalid model!'
@@ -92,6 +92,23 @@ then
 	done
 fi
 
+### Check that we have a valid tar
+for TARNAME in gnu-tar GNU-TAR
+do
+	if [ -e /mnt/cf/$TARNAME ]
+	then
+		TARBIN=/mnt/cf/$TARNAME
+	fi
+done
+
+if [ ! -e $TARBIN ]; then
+	echo 'Please place a valid copy of tar as "gnu-tar" on your card'
+	echo 'Please reset'
+	while true
+	do
+	done
+fi
+
 mkdir -p $TMPPATH > /dev/null 2>&1
 
 cd $DATAPATH/
@@ -243,13 +260,17 @@ do
     
 		cd /hdd1
 		echo 'Now extracting...'
-		gzip -dc $DATAPATH/$TARGETFILE | tar xf -
+		gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
 		if [ "$?" != "0" ]; then
 		    echo "Error!"
 		    exit "$?"
 		fi
 
 		echo 'Success!'
+		
+		#This can be useful for debugging
+		#/bin/sh -i
+		
 		# remount as RO
 		cd /
 		umount /hdd1
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index c4db1055d5..7707e48eeb 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -3,7 +3,8 @@ DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
 PR = "r2"
 
-SRC_URI = "file://updater.sh"
+SRC_URI = "file://updater.sh \
+           file://gnu-tar.gz"
 S = "${WORKDIR}"
 
 do_compile() {
@@ -13,6 +14,14 @@ do_compile() {
 do_deploy() {
 	install -d ${DEPLOY_DIR}/images/
 	install -m 0755 updater.sh ${DEPLOY_DIR}/images/updater.sh.${MACHINE}
+
+	case ${MACHINE} in
+		spitz | borzoi )
+			install -m 0755 gnu-tar ${DEPLOY_DIR}/images/gnu-tar
+			;;
+        	*)
+			;;
+	esac
 }
 
 addtask deploy before do_build after do_compile