[oe-commits] org.oe.dev merge of '618bc57259adc999e3aa2e274184f51d0b2c25ff'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Nov 22 13:28:59 UTC 2007
merge of '618bc57259adc999e3aa2e274184f51d0b2c25ff'
and 'd3817d825e9b6c052e0da2a808abdcdb3a410892'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: cadee31ee80c3c0fc7fb69173a52811d083a81a2
ViewMTN: http://monotone.openembedded.org/revision/info/cadee31ee80c3c0fc7fb69173a52811d083a81a2
Files:
1
packages/zaurus-updater/spitz
packages/zaurus-updater/spitz/updater.sh
packages/zaurus-updater/akita/updater.sh
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
conf/distro/include/angstrom.inc
packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
Diffs:
#
# mt diff -r618bc57259adc999e3aa2e274184f51d0b2c25ff -rcadee31ee80c3c0fc7fb69173a52811d083a81a2
#
#
#
# delete "packages/zaurus-updater/spitz"
#
# delete "packages/zaurus-updater/spitz/updater.sh"
#
# patch "packages/zaurus-updater/akita/updater.sh"
# from [71a4dadcc6448fcc9911e0f977a6e9e4fa0c4e5f]
# to [832116bb9a867c6d1150b57f11ad9893965cb035]
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [d49404556e2187447d41a9c4c22080442b70d001]
# to [dcc33e7466ed242c616fb02fb777ba2dd39a1eba]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [0841e26124c537013227ff1ca2c7645139dfb6e4]
# to [ad00179ab36c465f5519eb89cc47983be97b1ea6]
#
============================================================
--- packages/zaurus-updater/akita/updater.sh 71a4dadcc6448fcc9911e0f977a6e9e4fa0c4e5f
+++ packages/zaurus-updater/akita/updater.sh 832116bb9a867c6d1150b57f11ad9893965cb035
@@ -181,53 +181,53 @@ do
/sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
- if [ "$MODEL" = "SL-C1000" ] && [ $TARGETTYPE = Kernel ]; then
- echo $TARGETFILE':'$DATASIZE'bytes'
- echo ' ' > /tmp/data
- /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
- /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
- /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
- #loop
- else
- 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`
+ if [ "$MODEL" = "SL-C1000" ] && [ $TARGETTYPE = Kernel ]; then
+ echo $TARGETFILE':'$DATASIZE'bytes'
+ echo ' ' > /tmp/data
+ /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
+ #loop
+ else
+ 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
- #echo 'ADDR='$ADDR
- #echo 'SIZE='$TMPSIZE
- #echo 'TMPDATA='$TMPDATA
- 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;
+ #handle data file
+ #echo 'ADDR='$ADDR
+ #echo 'SIZE='$TMPSIZE
+ #echo 'TMPDATA='$TMPDATA
+ 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
- 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
+ rm $TMPDATA > /dev/null 2>&1
- #progress
- SPNUM=0
- while [ $SPNUM -lt $PROGSTEP ]
- do
- echo -n '.'
- SPNUM=`expr $SPNUM + 1`
+ #progress
+ SPNUM=0
+ while [ $SPNUM -lt $PROGSTEP ]
+ do
+ echo -n '.'
+ SPNUM=`expr $SPNUM + 1`
+ done
done
- done
- fi
+ fi
echo ''
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh d49404556e2187447d41a9c4c22080442b70d001
+++ packages/zaurus-updater/zaurus-updater/updater.sh dcc33e7466ed242c616fb02fb777ba2dd39a1eba
@@ -21,6 +21,12 @@
# - 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
@@ -38,6 +44,8 @@ RO_MTD=/dev/mtd$RO_MTD_NO
RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2`
RO_MTD=/dev/mtd$RO_MTD_NO
+echo "RO_MTD = $RO_MTD"
+
LOGOCAL_MTD=/dev/mtd1
VERBLOCK=0x48000
@@ -159,9 +167,9 @@ do_flashing()
if [ $ISFORMATTED = 0 ]
then
- echo -n 'Flash erasing...'
+ LOG="flash erasing ($TARGET_MTD) start"; date_log
/sbin/eraseall $TARGET_MTD > /dev/null 2>&1
- echo 'done'
+ LOG="flash erasing ($TARGET_MTD) end"; date_log
ISFORMATTED=1
fi
@@ -176,6 +184,7 @@ 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
@@ -183,43 +192,44 @@ 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
- 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`
+ #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
+ #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
+ rm $TMPDATA > /dev/null 2>&1
- #progress
- SPNUM=0
- while [ $SPNUM -lt $PROGSTEP ]
- do
- echo -n '.'
- SPNUM=`expr $SPNUM + 1`
- done
- done
+ #progress
+ SPNUM=0
+ while [ $SPNUM -lt $PROGSTEP ]
+ do
+ echo -n '.'
+ SPNUM=`expr $SPNUM + 1`
+ done
+ done
echo ''
@@ -230,12 +240,16 @@ 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.'
@@ -288,6 +302,8 @@ mkdir -p $TMPPATH > /dev/null 2>&1
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
@@ -311,7 +327,6 @@ do
then
continue
fi
- echo 'kernel'
FLASHED_KERNEL=1
ISLOGICAL=1
MODULEID=5
@@ -322,7 +337,12 @@ do
ONESIZE=524288
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)
@@ -341,7 +361,11 @@ 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)
@@ -356,6 +380,8 @@ done
esac
done
+/bin/sh
+
# reboot
exit 0
============================================================
--- packages/zaurus-updater/zaurus-updater.bb 0841e26124c537013227ff1ca2c7645139dfb6e4
+++ packages/zaurus-updater/zaurus-updater.bb ad00179ab36c465f5519eb89cc47983be97b1ea6
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r8"
+PR = "r9"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
#
# mt diff -rd3817d825e9b6c052e0da2a808abdcdb3a410892 -rcadee31ee80c3c0fc7fb69173a52811d083a81a2
#
#
#
# patch "conf/distro/include/angstrom.inc"
# from [9a60ebf691335d1d901b90a8904aff3769f5c1e7]
# to [fbec2661b476213454b69adc6d89a7b5be329d4d]
#
# patch "packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch"
# from [cc0e9b8762c22daff42051281744706d62d5803b]
# to [fafdfc3854b5e99219b8730f6e4eec6426b59ec8]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [590c157e0e46a16b445eca5e6f9890d7b346afb4]
# to [31f806960351e14859e325b9073986126a23ca3a]
#
============================================================
--- conf/distro/include/angstrom.inc 9a60ebf691335d1d901b90a8904aff3769f5c1e7
+++ conf/distro/include/angstrom.inc fbec2661b476213454b69adc6d89a7b5be329d4d
@@ -185,6 +185,8 @@ FEED_ARCH_turbostation = "ppc603e"
FEED_ARCH_lsppchg = "ppc603e"
FEED_ARCH_storcenter = "ppc603e"
FEED_ARCH_turbostation = "ppc603e"
+FEED_ARCH_mpc8313e-rdb = "ppce300c3"
+FEED_ARCH_mpc8323e-rdb = "ppce300c2"
#strongarm machines, no EABI
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch cc0e9b8762c22daff42051281744706d62d5803b
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch fafdfc3854b5e99219b8730f6e4eec6426b59ec8
@@ -1,8 +1,16 @@
-diff --git a/configure.ac b/configure.ac
-index 76d33f0..2807c50 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1824,6 +1824,7 @@ hw/kdrive/ati/Makefile
+Index: xorg-server-1.3.0.0/configure.ac
+===================================================================
+--- xorg-server-1.3.0.0.orig/configure.ac 2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/configure.ac 2007-11-22 17:59:56.000000000 +0800
+@@ -1576,6 +1576,7 @@
+ AM_CONDITIONAL(H3600_TS, false)
+ AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
+ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
++AM_CONDITIONAL(KDRIVEGLAMO, [test x"$ac_cv_header_sys_vm86_h" = xyes -o x"$ac_cv_header_linux_fb_h" = xyes])
+
+ # Xephyr needs nanosleep() which is in librt on Solaris
+ AC_CHECK_FUNC([nanosleep], [],
+@@ -1824,6 +1825,7 @@
hw/kdrive/chips/Makefile
hw/kdrive/ephyr/Makefile
hw/kdrive/epson/Makefile
@@ -10,30 +18,37 @@ index 76d33f0..2807c50 100644
hw/kdrive/fake/Makefile
hw/kdrive/fbdev/Makefile
hw/kdrive/w100/Makefile
-diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
-index 8075a56..b97912d 100644
---- a/hw/kdrive/Makefile.am
-+++ b/hw/kdrive/Makefile.am
-@@ -4,7 +4,7 @@ VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
+Index: xorg-server-1.3.0.0/hw/kdrive/Makefile.am
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/Makefile.am 2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/hw/kdrive/Makefile.am 2007-11-22 17:54:54.000000000 +0800
+@@ -7,6 +7,10 @@
+ FBDEV_SUBDIRS = fbdev epson
endif
- if KDRIVEFBDEV
--FBDEV_SUBDIRS = fbdev epson
-+FBDEV_SUBDIRS = fbdev epson glamo
++if KDRIVEGLAMO
++GLAMO_SUBDIRS = glamo
++endif
++
+ if KDRIVEW100
+ W100_SUBDIRS = w100
endif
-
- if KDRIVEW100
-@@ -34,4 +34,4 @@ SUBDIRS = \
+@@ -30,8 +34,9 @@
+ $(FBDEV_SUBDIRS) \
+ $(W100_SUBDIRS) \
+ $(VESA_SUBDIRS) \
++ $(GLAMO_SUBDIRS) \
+ $(XEPHYR_SUBDIRS) \
fake
DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
- smi via fbdev sdl ephyr src linux fake sis300
+ smi via fbdev sdl ephyr src linux fake sis300 glamo
-diff --git a/hw/kdrive/glamo/Makefile.am b/hw/kdrive/glamo/Makefile.am
-index e8c48a4..ffb7a30 100644
---- a/hw/kdrive/glamo/Makefile.am
-+++ b/hw/kdrive/glamo/Makefile.am
-@@ -41,11 +41,14 @@ GLAMO_LIBS = \
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:35.000000000 +0800
+@@ -41,11 +41,14 @@
Xglamo_LDADD = \
$(GLAMO_LIBS) \
@@ -50,11 +65,11 @@ index e8c48a4..ffb7a30 100644
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
-diff --git a/hw/kdrive/glamo/glamo_stub.c b/hw/kdrive/glamo/glamo_stub.c
-index d772671..df43455 100644
---- a/hw/kdrive/glamo/glamo_stub.c
-+++ b/hw/kdrive/glamo/glamo_stub.c
-@@ -49,16 +49,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:34.000000000 +0800
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:35.000000000 +0800
+@@ -49,16 +49,10 @@
void
InitInput(int argc, char **argv)
{
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb 590c157e0e46a16b445eca5e6f9890d7b346afb4
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb 31f806960351e14859e325b9073986126a23ca3a
@@ -1,9 +1,9 @@ PE = "1"
require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r20"
+PR = "r21"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
More information about the Openembedded-commits
mailing list