[oe-commits] org.oe.dev merge of '6ac18f3dcd3bdc55e3c6e2b808ce11f25dbd163e'

[koen commit]

merge of '6ac18f3dcd3bdc55e3c6e2b808ce11f25dbd163e'
     and 'c1726a91450c9a012bcaa95d2c1d0c935197ce53'

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

#
# mt diff -r6ac18f3dcd3bdc55e3c6e2b808ce11f25dbd163e -r63bd07100c4d0904c27a64b7a474be0dd371ac7a
#
# 
# 
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
#  from [47d7d925c304b036c45562a752ae139b744f7c6a]
#    to [b20b6450310cee01b3ad65ab6cf78e66fe1fdb08]
# 
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh	47d7d925c304b036c45562a752ae139b744f7c6a
+++ packages/zaurus-updater/zaurus-updater/updater.sh	b20b6450310cee01b3ad65ab6cf78e66fe1fdb08
@@ -22,7 +22,10 @@
 #
 # 2007.11.23 Koen Kooi
 # - consistent error messages
-# - fix flashing from case sensitive filesystem (e.g. ext2)
+## - fix flashing from case sensitive filesystem (e.g. ext2)
+# 2007.11.23 Matthias 'CoreDump' Hentges
+# - Always treat MTD_PART_SIZE as HEX when comparing sizes
+# - Thanks to ZeroChaos for debugging
 
 DATAPATH=$1
 TMPPATH=/tmp/update
@@ -148,6 +151,7 @@ do_flashing()
     if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
     then
         echo "Error: File is too big to flash!"
+	echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"	
         return
     fi
 
@@ -294,9 +298,9 @@ do
     DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
 
     # make TARGETFILE lowercase
-    TARGETFILE_LC=`echo $TARGETFILE|tr A-Z a-z`
+    TARGETFILE=`echo $TARGETFILE|tr A-Z a-z`
 
-    case "$TARGETFILE_LC" in
+    case "$TARGETFILE" in
 
     zimage|zimage.bin)
         if [ $FLASHED_KERNEL != 0 ]
@@ -328,7 +332,7 @@ do
         FLASHED_ROOTFS=1
         ISLOGICAL=0
         MODULEID=6
-        MTD_PART_SIZE=$ROOTFS_SIZE
+        MTD_PART_SIZE="0x$ROOTFS_SIZE"
         ADDR=0
         ISFORMATTED=0
         TARGET_MTD=$RO_MTD


#
# mt diff -rc1726a91450c9a012bcaa95d2c1d0c935197ce53 -r63bd07100c4d0904c27a64b7a474be0dd371ac7a
#
# 
# 
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
#  from [bf8001d31b9a9279c2d850fc8a93d1258ec80217]
#    to [b20b6450310cee01b3ad65ab6cf78e66fe1fdb08]
# 
# patch "packages/zaurus-updater/zaurus-updater.bb"
#  from [11c4539830f684b4da49831b50d6afd4032b4413]
#    to [7a273ae9f26d4da3830acc3f36b0dd21a6432e48]
# 
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh	bf8001d31b9a9279c2d850fc8a93d1258ec80217
+++ packages/zaurus-updater/zaurus-updater/updater.sh	b20b6450310cee01b3ad65ab6cf78e66fe1fdb08
@@ -22,7 +22,7 @@
 #
 # 2007.11.23 Koen Kooi
 # - consistent error messages
-#
+## - fix flashing from case sensitive filesystem (e.g. ext2)
 # 2007.11.23 Matthias 'CoreDump' Hentges
 # - Always treat MTD_PART_SIZE as HEX when comparing sizes
 # - Thanks to ZeroChaos for debugging
============================================================
--- packages/zaurus-updater/zaurus-updater.bb	11c4539830f684b4da49831b50d6afd4032b4413
+++ packages/zaurus-updater/zaurus-updater.bb	7a273ae9f26d4da3830acc3f36b0dd21a6432e48
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r12"
+PR = "r13"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"