[oe-commits] org.oe.dev merge of '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
xora commit
openembedded-commits at lists.openembedded.org
Mon Nov 19 16:05:20 UTC 2007
merge of '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
and '9ba226be3bc404bdc4a0da2edf0e3b73a2f004e3'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: afc80db8fab3b6a16e23409594197e4000e28086
ViewMTN: http://monotone.openembedded.org/revision/info/afc80db8fab3b6a16e23409594197e4000e28086
Files:
1
packages/netbase/netbase/fic-gta01/interfaces
packages/netbase/netbase/fic-gta02/interfaces
packages/netbase/netbase_4.21.bb
packages/zaurus-updater/c7x0
packages/zaurus-updater/c7x0/updater.sh
packages/zaurus-updater/tosa
packages/zaurus-updater/tosa/updater.sh
packages/zaurus-updater/zaurus-updater
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47 -rafc80db8fab3b6a16e23409594197e4000e28086
#
#
#
# patch "packages/netbase/netbase/fic-gta01/interfaces"
# from [b119191890448d523db7d93579548ffd89c4a050]
# to [994ab7e5993a6cceab226b5b58a95031d6466741]
#
# patch "packages/netbase/netbase/fic-gta02/interfaces"
# from [b119191890448d523db7d93579548ffd89c4a050]
# to [994ab7e5993a6cceab226b5b58a95031d6466741]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [8d3a1db23199321161b8aec311e1e9170f56d2bb]
# to [7d4b4b1ee1b6a900f60e97a679a2597ee3a38fbd]
#
============================================================
--- packages/netbase/netbase/fic-gta01/interfaces b119191890448d523db7d93579548ffd89c4a050
+++ packages/netbase/netbase/fic-gta01/interfaces 994ab7e5993a6cceab226b5b58a95031d6466741
@@ -22,6 +22,7 @@ iface usb0 inet static
netmask 255.255.255.0
network 192.168.0.0
gateway 192.168.0.200
+ up echo nameserver 192.168.0.200 >/etc/resolv.conf
# Bluetooth networking
iface bnep0 inet dhcp
============================================================
--- packages/netbase/netbase/fic-gta02/interfaces b119191890448d523db7d93579548ffd89c4a050
+++ packages/netbase/netbase/fic-gta02/interfaces 994ab7e5993a6cceab226b5b58a95031d6466741
@@ -22,6 +22,7 @@ iface usb0 inet static
netmask 255.255.255.0
network 192.168.0.0
gateway 192.168.0.200
+ up echo nameserver 192.168.0.200 >/etc/resolv.conf
# Bluetooth networking
iface bnep0 inet dhcp
============================================================
--- packages/netbase/netbase_4.21.bb 8d3a1db23199321161b8aec311e1e9170f56d2bb
+++ packages/netbase/netbase_4.21.bb 7d4b4b1ee1b6a900f60e97a679a2597ee3a38fbd
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
SECTION = "base"
LICENSE = "GPL"
-PR = "r23"
+PR = "r24"
inherit update-rc.d
#
# mt diff -r9ba226be3bc404bdc4a0da2edf0e3b73a2f004e3 -rafc80db8fab3b6a16e23409594197e4000e28086
#
#
#
# delete "packages/zaurus-updater/c7x0"
#
# delete "packages/zaurus-updater/c7x0/updater.sh"
#
# delete "packages/zaurus-updater/tosa"
#
# delete "packages/zaurus-updater/tosa/updater.sh"
#
# add_dir "packages/zaurus-updater/zaurus-updater"
#
# add_file "packages/zaurus-updater/zaurus-updater/updater.sh"
# content [d49404556e2187447d41a9c4c22080442b70d001]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [8f431da1e46051baa0e8fb2ca9012101c3146fea]
# to [0841e26124c537013227ff1ca2c7645139dfb6e4]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh d49404556e2187447d41a9c4c22080442b70d001
+++ packages/zaurus-updater/zaurus-updater/updater.sh d49404556e2187447d41a9c4c22080442b70d001
@@ -0,0 +1,379 @@
+#!/bin/sh
+
+#
+# One updater.sh to rule them all
+#
+# 2006.10.24 Marcin 'Hrw' Juszkiewicz
+# - started work on common updater.sh
+# - works on poodle, c760, spitz
+# - breaks on tosa
+#
+# 2007.10.08 Marcin 'Hrw' Juszkiewicz
+# - do not allow to flash files bigger then partition size
+# - created functions for common stuff
+#
+# 2007.11.18 Dmitry 'Lumag' Baryshkov
+# - fixes
+# - tosa unbreak
+#
+# 2007.11.19 Marcin 'Hrw' Juszkiewicz
+# - size check unbreak
+# - c760/c860 has bigger rootfs - use it
+#
+
+DATAPATH=$1
+TMPPATH=/tmp/update
+TMPDATA=$TMPPATH/tmpdata.bin
+TMPHEAD=$TMPPATH/tmphead.bin
+
+FLASHED_KERNEL=0
+FLASHED_ROOTFS=0
+UNPACKED_ROOTFS=0 # spitz only
+
+RO_MTD_LINE=`cat /proc/mtd | grep "root" | tail -n 1`
+if [ "$RO_MTD_LINE" = "" ]; then
+ RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
+fi
+RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2`
+RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2`
+RO_MTD=/dev/mtd$RO_MTD_NO
+
+LOGOCAL_MTD=/dev/mtd1
+
+VERBLOCK=0x48000
+MVRBLOCK=0x70000
+
+RESULT=0
+
+Cleanup()
+{
+ rm -f $VTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ exit $1
+}
+
+trap 'Cleanup 1' 1 15
+trap '' 2 3
+
+get_dev_pcmcia()
+{
+ while read SOCKET CLASS DRIVER INSTANCE DEVS MAJOR MINOR;
+ do
+ echo $DEVS
+ done
+}
+
+get_dev_pcmcia_slot()
+{
+ grep "^$1" /var/lib/pcmcia/stab | get_dev_pcmcia
+}
+
+check_for_hdd()
+{
+ IDE1=`get_dev_pcmcia_slot 1`
+ if [ "$IDE1" = "" ]; then
+ echo "Error!! There is no microdrive. Retrying..."
+ while [ "$IDE1" = "" ]; do
+ IDE1=`get_dev_pcmcia_slot 1`
+ done
+ echo "Microdrive found."
+ fi
+
+ LINUXFMT=ext3
+ MKE2FSOPT=-j
+}
+
+check_for_tar()
+{
+ ### Check that we have a valid tar
+ for TARNAME in gnu-tar GNU-TAR
+ do
+ if [ -e $DATAPATH/$TARNAME ]
+ then
+ TARBIN=$DATAPATH/$TARNAME
+ fi
+ done
+
+ if [ ! -e $TARBIN ]; then
+ echo 'ERRROR: Please place a valid copy of tar as "gnu-tar" on your card.'
+ echo 'Please reset'
+ while true
+ do
+ done
+ fi
+}
+
+do_rootfs_extraction()
+{
+ UNPACKED_ROOTFS=1
+ echo 'HDD root file system'
+ if [ ! -f /hdd1/NotAvailable ]; then
+ umount /hdd1
+ fi
+ echo 'Now formatting...'
+ mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
+ e2fsck -p /dev/${IDE1}1 > /dev/null
+ if [ "$?" != "0" ]; then
+ echo "ERROR: Unable to create filesystem on microdrive!"
+ exit "$?"
+ fi
+
+ mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
+ if [ "$?" != "0" ]; then
+ echo "ERROR: Unable to mount microdrive!"
+ exit "$?"
+ fi
+
+ cd /hdd1
+ echo 'Now extracting...'
+ gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
+ if [ "$?" != "0" ]; then
+ echo "ERROR: Unable to extract root filesystem archive!"
+ exit "$?"
+ fi
+
+ echo 'Done.'
+
+ # remount as RO
+ cd /
+ umount /hdd1
+ mount -t $LINUXFMT -o ro,noatime /dev/${IDE1}1 /hdd1
+}
+
+do_flashing()
+{
+ if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
+ then
+ echo "ERROR: File is too big to flash!"
+ 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
+ fi
+
+ if [ $ISFORMATTED = 0 ]
+ then
+ echo -n 'Flash erasing...'
+ /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
+ echo 'done'
+ ISFORMATTED=1
+ fi
+
+ echo ''
+ echo '0% 100%'
+ PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
+ PROGSTEP=`expr 25 / $PROGSTEP`
+ if [ $PROGSTEP = 0 ]
+ then
+ PROGSTEP=1
+ fi
+
+ if [ -e $TMPHEAD ]
+ then
+ VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+
+ /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
+ fi
+
+ #loop
+ while [ $DATAPOS -lt $DATASIZE ]
+ do
+ #data create
+ bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
+ TMPSIZE=`wc -c $TMPDATA`
+ TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
+ DATAPOS=`expr $DATAPOS + $TMPSIZE`
+
+ #handle data file
+ if [ $ISLOGICAL = 0 ]
+ then
+ next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
+ if [ "$next_addr" = "" ]; then
+ echo "ERROR: flash write"
+ rm $TMPDATA > /dev/null 2>&1
+ RESULT=3
+ break;
+ fi
+ ADDR=$next_addr
+ else
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
+ ADDR=`expr $ADDR + $TMPSIZE`
+ fi
+
+ rm $TMPDATA > /dev/null 2>&1
+
+ #progress
+ SPNUM=0
+ while [ $SPNUM -lt $PROGSTEP ]
+ do
+ echo -n '.'
+ SPNUM=`expr $SPNUM + 1`
+ done
+ done
+
+ echo ''
+
+ #finish
+ rm -f $TMPPATH/*.bin > /dev/null 2>&1
+
+ if [ $RESULT = 0 ]
+ then
+ if [ -e $VTMPNAME ]
+ then
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ rm -f $VTMPNAME > /dev/null 2>&1
+ fi
+ if [ -e $MTMPNAME ]
+ then
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ fi
+ echo 'Done.'
+ else
+ echo 'Error!'
+ fi
+}
+
+### Check model ###
+/sbin/writerominfo
+MODEL=`cat /proc/deviceinfo/product`
+case "$MODEL" in
+ SL-B500|SL-5600)
+ ZAURUS='poodle'
+ ROOTFS_SIZE=0x1600000
+ ;;
+ SL-6000)
+ ZAURUS='tosa'
+ ROOTFS_SIZE=0x1E00000
+ ;;
+ SL-C1000)
+ ZAURUS='akita'
+ ROOTFS_SIZE=0x1900000
+ ;;
+ SL-C700|SL-C750|SL-7500)
+ ZAURUS='c7x0'
+ ROOTFS_SIZE=0x1900000
+ ;;
+ SL-C760|SL-C860)
+ ZAURUS='c7x0'
+ ROOTFS_SIZE=0x3500000
+ ;;
+ SL-C3000|SL-C3100|SL-C3200)
+ ZAURUS='c3x00'
+ ROOTFS_SIZE=0x0500000
+ check_for_hdd
+ check_for_tar
+ ;;
+ *)
+ echo 'MODEL: '$MODEL 'is unsupported'
+ echo ''
+ echo 'Please reset'
+ while true
+ do
+ done
+ ;;
+esac
+
+echo 'MODEL: '$MODEL' ('$ZAURUS')'
+
+mkdir -p $TMPPATH > /dev/null 2>&1
+
+cd $DATAPATH/
+
+for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ
+do
+ if [ ! -e $TARGETFILE ]
+ then
+ continue
+ fi
+
+ rm -f $TMPPATH/*.bin > /dev/null 2>&1
+ DATASIZE=`wc -c $TARGETFILE`
+ DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
+
+ # make TARGETFILE lowercase
+ TARGETFILE=`echo $TARGETFILE|tr A-Z a-z`
+
+ case "$TARGETFILE" in
+
+ zimage|zimage.bin)
+ if [ $FLASHED_KERNEL != 0 ]
+ then
+ continue
+ fi
+ echo 'kernel'
+ FLASHED_KERNEL=1
+ ISLOGICAL=1
+ MODULEID=5
+ MTD_PART_SIZE=0x13C000
+ ADDR=`dc 0xE0000`
+ ISFORMATTED=1
+ DATAPOS=0
+ ONESIZE=524288
+ HDTOP=`expr $DATASIZE - 16`
+ /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE
+ do_flashing
+ ;;
+
+ initrd.bin)
+ if [ $FLASHED_ROOTFS != 0 ]
+ then
+ continue
+ fi
+ echo 'root file system'
+ FLASHED_ROOTFS=1
+ ISLOGICAL=0
+ MODULEID=6
+ MTD_PART_SIZE=$ROOTFS_SIZE
+ ADDR=0
+ ISFORMATTED=0
+ TARGET_MTD=$RO_MTD
+ DATAPOS=16
+ ONESIZE=1048576
+ /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
+ do_flashing
+ ;;
+
+ hdimage1.tgz)
+ if [ $UNPACKED_ROOTFS = 0 ]
+ then
+ do_rootfs_extraction
+ fi
+ ;;
+
+ *)
+ ;;
+ esac
+done
+
+# reboot
+exit 0
+
+# bcut usage: bcut [OPTION] <input file>
+
+# -a: start position
+# -s: cut size
+# -o: output file
+
+# ModuleId informations used by verchg Sharp binary:
+#
+# 0 - master
+# 1 - Maintaince
+# 2 - Diagnostics
+# 3 - rescue kernel
+# 4 - rescue rootfs
+# 5 - normal kernel
+# 6 - normal rootfs
+# 7 - /home/
+# 8 - parameter (whatever it means)
+#
============================================================
--- packages/zaurus-updater/zaurus-updater.bb 8f431da1e46051baa0e8fb2ca9012101c3146fea
+++ packages/zaurus-updater/zaurus-updater.bb 0841e26124c537013227ff1ca2c7645139dfb6e4
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r7"
+PR = "r8"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
More information about the Openembedded-commits
mailing list