[oe-commits] org.oe.dev zaurus-updater: fixed JFFS2: wrong bitmask problems (some code needs to run only on Tosa and Poodle)

[hrw commit]

zaurus-updater: fixed JFFS2: wrong bitmask problems (some code needs to run only on Tosa and Poodle)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b9d72c3b2667d036ca41078c8c8f39cdccf8ee69
ViewMTN: http://monotone.openembedded.org/revision/info/b9d72c3b2667d036ca41078c8c8f39cdccf8ee69
Files:
1
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:

#
# mt diff -r05f19a774cd68696764a22b8ee2cec3a1ea22897 -rb9d72c3b2667d036ca41078c8c8f39cdccf8ee69
#
# 
# 
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
#  from [6b35fdb4a99fc46b99887c47f8bff9cd70d0cab6]
#    to [469e259ca0c6962e5aebabe8670af39d0e0ea80d]
# 
# patch "packages/zaurus-updater/zaurus-updater.bb"
#  from [17a310f0b8b06db9d390982494ba835550b32204]
#    to [c253a50a75d42e45a78388571d0e841b3b6b51b8]
# 
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh	6b35fdb4a99fc46b99887c47f8bff9cd70d0cab6
+++ packages/zaurus-updater/zaurus-updater/updater.sh	469e259ca0c6962e5aebabe8670af39d0e0ea80d
@@ -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 ]
============================================================
--- packages/zaurus-updater/zaurus-updater.bb	17a310f0b8b06db9d390982494ba835550b32204
+++ packages/zaurus-updater/zaurus-updater.bb	c253a50a75d42e45a78388571d0e841b3b6b51b8
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r15"
+PR = "r16"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"