[oe-commits] org.oe.oz354x zaurus-updater-reloaded: Apply a change to the machine setup as suggested by hrw

[coredump commit]

zaurus-updater-reloaded: Apply a change to the machine setup as suggested by hrw

Author: coredump at openembedded.org
Branch: org.openembedded.oz354x
Revision: 9eb98b7e5b924bce014197613ee736d1bd11de43
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9eb98b7e5b924bce014197613ee736d1bd11de43
Files:
1
packages/zaurus-updater-reloaded/files/updater.sh
packages/zaurus-updater-reloaded/zaurus-updater-reloaded.bb
Diffs:

#
# mt diff -r8a2741bf814530415e0fdaa49ce817bfb8b85786 -r9eb98b7e5b924bce014197613ee736d1bd11de43
#
# 
# 
# patch "packages/zaurus-updater-reloaded/files/updater.sh"
#  from [237fcf452aa6cfb3e61b0cfdb52166d84b48fd9f]
#    to [4b5d3a4deeeb90b32257a284986928aaf9ae9066]
# 
# patch "packages/zaurus-updater-reloaded/zaurus-updater-reloaded.bb"
#  from [2276b1799fca0002ed074145a1884723177bf7a6]
#    to [88abb3937330c6eb4de0b95b077a78b3d1fb8f7b]
# 
============================================================
--- packages/zaurus-updater-reloaded/files/updater.sh	237fcf452aa6cfb3e61b0cfdb52166d84b48fd9f
+++ packages/zaurus-updater-reloaded/files/updater.sh	4b5d3a4deeeb90b32257a284986928aaf9ae9066
@@ -51,28 +51,40 @@ get_model(){
 	# w/o writerominfo /proc/deviceinfo/product returns "unknown"
 	/sbin/writerominfo
 	PDA_MODEL=`cat /proc/deviceinfo/product`
+
+	# These variables are the same for all machines to date
+	KERNEL_ISLOGICAL=1
+	KERNEL_MODULEID=5
+	KERNEL_MODULESIZE=0x13C000
+	KERNEL_ADDR=`dc 0xE0000`
+	KERNEL_ISFORMATTED=1
+	KERNEL_DATAPOS=0
+	KERNEL_ONESIZE=524288
 	
+	ROOTFS_ISLOGICAL=0
+	ROOTFS_MODULEID=6				
+	ROOTFS_ADDR=0
+	ROOTFS_ISFORMATTED=0				
+	ROOTFS_DATAPOS=16
+	ROOTFS_ONESIZE=1048576				
+
+	
 	case "$PDA_MODEL" in
 	SL-B500|SL-5600)	PDA_NAME="Poodle"
 				KERNEL_TYPES="NAND"
 				ROOTFS_TYPES="NAND sdimage"
 				
-				KERNEL_ISLOGICAL=1
-				KERNEL_MODULEID=5
-				KERNEL_MODULESIZE=0x13C000
-				KERNEL_ADDR=`dc 0xE0000`
-				KERNEL_ISFORMATTED=1
-				KERNEL_DATAPOS=0
-				KERNEL_ONESIZE=524288
-				
-				ROOTFS_ISLOGICAL=0
-				ROOTFS_MODULEID=6
 				ROOTFS_MODULESIZE=0x1600000
-				ROOTFS_ADDR=0
-				ROOTFS_ISFORMATTED=0				
-				ROOTFS_DATAPOS=16
-				ROOTFS_ONESIZE=1048576				
+				
 				;;
+				
+	SL-C1000)		PDA_NAME="Akita"
+				KERNEL_TYPES="NAND"
+				ROOTFS_TYPES="NAND"
+
+				ROOTFS_MODULESIZE=0x1900000
+				
+				;;
 	*)			die "Error: Unknown model: [$PDA_MODEL]"
 				;;
 	esac
@@ -124,6 +136,9 @@ update_sdimage_rootfs(){
 				echo ""
 				echo "${C_RESET}Note: gnu-tar is missing!${C_WHITE}"
 				return
+			else	
+				# Work around yet another stupid problem $USER will run into from time to time
+				chmod a+x ./gnu-tar >/dev/null 2>&1
 			fi
 		
 			echo ""
@@ -178,7 +193,7 @@ update_sdimage_rootfs(){
 			# Well, as a last resort, rely on SHARPs auto-mounter
 			if test -e /mnt/card/NotAvailable
 			then
-				echo -e "\nPlease eject the SD/MMC \ncard and re-insert it."
+				echo -e "\nPlease eject the SD/MMC \ncard and re-insert it.\n"
 				echo "Press <ENTER> when finished"
 				read junk
 				sleep 2
============================================================
--- packages/zaurus-updater-reloaded/zaurus-updater-reloaded.bb	2276b1799fca0002ed074145a1884723177bf7a6
+++ packages/zaurus-updater-reloaded/zaurus-updater-reloaded.bb	88abb3937330c6eb4de0b95b077a78b3d1fb8f7b
@@ -1,9 +1,9 @@ PR = "r0"
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
 
 PR = "r0"
-PV= "0.0.1"
+PV= "0.0.2"
 
 SRC_URI = "file://updater.sh \
            file://gnu-tar.gz"