diff options
Diffstat (limited to 'packages/zaurus-updater')
| -rw-r--r-- | packages/zaurus-updater/zaurus-updater.bb | 2 | ||||
| -rw-r--r-- | packages/zaurus-updater/zaurus-updater/updater.sh | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index ec8f16c9bf..f481348291 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 = "r9" +PR = "r10" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index d6e5b7fc15..154ead0e28 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -21,12 +21,6 @@ # - c760/c860 has bigger rootfs - use it # -date_log() -{ - echo "$LOG: `date`" -} -LOG="updater start"; date_log - DATAPATH=$1 TMPPATH=/tmp/update TMPDATA=$TMPPATH/tmpdata.bin @@ -167,9 +161,7 @@ do_flashing() if [ $ISFORMATTED = 0 ] then - LOG="flash erasing ($TARGET_MTD) start"; date_log /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 - LOG="flash erasing ($TARGET_MTD) end"; date_log ISFORMATTED=1 fi @@ -184,7 +176,6 @@ do_flashing() if [ -e $TMPHEAD ] then - LOG="nandlogical read start"; date_log VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 @@ -192,7 +183,6 @@ do_flashing() /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 - LOG="nandlogical read end"; date_log fi #loop @@ -240,16 +230,12 @@ do_flashing() then if [ -e $VTMPNAME ] then - LOG="nandlogical write2 start"; date_log /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - LOG="nandlogical write2 end"; date_log rm -f $VTMPNAME > /dev/null 2>&1 fi if [ -e $MTMPNAME ] then - LOG="nandlogical write3 start"; date_log /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - LOG="nandlogical write3 end"; date_log rm -f $MTMPNAME > /dev/null 2>&1 fi echo 'Done.' @@ -302,8 +288,6 @@ echo 'MODEL: '$MODEL' ('$ZAURUS')' mkdir -p $TMPPATH > /dev/null 2>&1 -LOG="updater after model"; date_log - cd $DATAPATH/ for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ @@ -338,11 +322,9 @@ do HDTOP=`expr $DATASIZE - 16` /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE echo "HDTOP=$HDTOP" - LOG="updater flashing kernel start"; date_log FLASH_TYPE="kernel" do_flashing FLASH_TYPE="" - LOG="updater flashing kernel end"; date_log ;; initrd.bin) @@ -361,11 +343,9 @@ do DATAPOS=16 ONESIZE=1048576 /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE - LOG="updater flashing rootfs start"; date_log FLASH_TYPE="rootfs" do_flashing FLASH_TYPE="" - LOG="updater flashing rootfs end"; date_log ;; hdimage1.tgz) |