summaryrefslogtreecommitdiff
path: root/packages/zaurus-updater
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-12-10 11:50:46 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-12-10 11:50:46 +0000
commit3f8e414430a57ed61786de2c4e15fc579f2955a5 (patch)
tree47e31f1efd60ca013bc086fa0bcdea35c19d468e /packages/zaurus-updater
parentb370618b9e62ec7edc00cbfd99168c9d314ba246 (diff)
zaurus-updater: fixed JFFS2: wrong bitmask problems (some code needs to run only on Tosa and Poodle)
Diffstat (limited to 'packages/zaurus-updater')
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb2
-rw-r--r--packages/zaurus-updater/zaurus-updater/updater.sh18
2 files changed, 12 insertions, 8 deletions
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index bf96dc26eb..a16c222bd2 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r15"
+PR = "r16"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh
index ef15e47df1..38a7414c95 100644
--- a/packages/zaurus-updater/zaurus-updater/updater.sh
+++ b/packages/zaurus-updater/zaurus-updater/updater.sh
@@ -32,6 +32,8 @@
#
# 2007.12.10 Marcin 'Hrw' Juszkiewicz
# - Reformatted file - please use spaces not tabs
+# - "version check" is only on Tosa and Poodle - breaks other machines
+#
DATAPATH=$1
TMPPATH=/tmp/update
@@ -161,13 +163,15 @@ do_flashing()
return
fi
- #check version
- /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
- if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
- then
- #no version info...
- rm -f $TMPHEAD > /dev/null 2>&1
- DATAPOS=0
+ if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
+ #check version
+ /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
+ if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+ then
+ #no version info...
+ rm -f $TMPHEAD > /dev/null 2>&1
+ DATAPOS=0
+ fi
fi
if [ $ISFORMATTED = 0 ]