[oe-commits] org.oe.dev merge of '5d703df48687b18de3beac73a0d364f47a49a736'
hrw commit
openembedded-commits at lists.openembedded.org
Wed Oct 31 10:52:02 UTC 2007
merge of '5d703df48687b18de3beac73a0d364f47a49a736'
and '9035f9a5f71e2ba479a0c67ef3e603dd91fe4cee'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 1168c6045fce975d6d8f7098c478705bea1622c8
ViewMTN: http://monotone.openembedded.org/revision/info/1168c6045fce975d6d8f7098c478705bea1622c8
Files:
1
packages/zaurus-updater/tosa/updater.sh
packages/zaurus-updater/zaurus-updater.bb
packages/fakeroot/fakeroot-1.8.3
packages/fakeroot/fakeroot-native-1.8.3
packages/telepathy/telepathy-inspector
packages/cairo/cairo_1.5.2.bb
packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch
packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch
packages/fakeroot/fakeroot-native_1.8.3.bb
packages/fakeroot/fakeroot_1.8.3.bb
packages/linux/linux-openmoko/fix-gta01-flowcontrol2-2.6.22.5.patch
packages/linux/linux-openmoko-devel/fix-gta01-flowcontrol2-2.6.23.patch
packages/telepathy/telepathy-inspector/scons-workaround.patch
packages/telepathy/telepathy-inspector_0.5.0.bb
packages/xorg-lib/pixman_0.9.6.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/base-files/base-files/slugos/fstab
packages/cairo/cairo.inc
packages/cairo/cairo_git.bb
packages/linux/linux-ezx-2.6.23/a780/defconfig
packages/linux/linux-ezx_2.6.23.bb
packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
packages/linux/linux-openmoko_2.6.22.5.bb
Diffs:
#
# mt diff -r5d703df48687b18de3beac73a0d364f47a49a736 -r1168c6045fce975d6d8f7098c478705bea1622c8
#
#
#
# patch "packages/zaurus-updater/tosa/updater.sh"
# from [d29d52cd16f3a899675b9760d3eae1c1c0c27f41]
# to [06f64cb6b3a9177fd1226c4983ec5753cb520939]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [eb65c6997de97b055d134ef9ed8b86d2866c399c]
# to [8f431da1e46051baa0e8fb2ca9012101c3146fea]
#
============================================================
--- packages/zaurus-updater/tosa/updater.sh d29d52cd16f3a899675b9760d3eae1c1c0c27f41
+++ packages/zaurus-updater/tosa/updater.sh 06f64cb6b3a9177fd1226c4983ec5753cb520939
@@ -1,27 +1,11 @@
#!/bin/sh
-#
-# One updater.sh to rule them all
-#
-# 2006.10.24 Marcin 'Hrw' Juszkiewicz
-# 2007.10.08 Marcin 'Hrw' Juszkiewicz
-# - do not allow to flash files bigger then partition size
-# - created functions for common stuff
-#
-# Totally untested!!!
-#
-/bin/sh
-
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
@@ -30,7 +14,19 @@ RO_MTD=/dev/mtd$RO_MTD_NO
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
+RO_MTDBLK=/dev/mtdblock$RO_MTD_NO
+RO_MTD_SIZE=`dc 0x$RO_MTD_SIZE_HEX 1024 /`
+RW_MTD_LINE=`cat /proc/mtd | grep "home" | tail -n 1`
+if [ "$RW_MTD_LINE" = "" ]; then
+ RW_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
+fi
+RW_MTD_NO=`echo $RW_MTD_LINE | cut -d: -f1 | cut -dd -f2`
+RW_MTD_SIZE_HEX=`echo $RW_MTD_LINE | cut -d" " -f2`
+RW_MTD=/dev/mtd$RW_MTD_NO
+RW_MTDBLK=/dev/mtdblock$RW_MTD_NO
+RW_MTD_SIZE=`dc 0x$RW_MTD_SIZE_HEX 1024 /`
+
LOGOCAL_MTD=/dev/mtd1
VERBLOCK=0x48000
@@ -38,326 +34,208 @@ RESULT=0
RESULT=0
-Cleanup()
-{
- rm -f $VTMPNAME > /dev/null 2>&1
- rm -f $MTMPNAME > /dev/null 2>&1
- exit $1
+Cleanup(){
+ rm -f $VTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ rm $CTRLPATH/* > /dev/null 2>&1
+ rm $DATAPATH/* > /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 model ###
+/sbin/writerominfo
+MODEL=`cat /proc/deviceinfo/product`
+if [ "$MODEL" != "SL-6000" ] > /dev/null 2>&1
+then
+ echo 'MODEL:'$MODEL
+ echo 'ERROR:Invalid model!'
+ echo 'Please reset'
+ while true
+ do
+ done
+fi
-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
+mkdir -p $TMPPATH > /dev/null 2>&1
- LINUXFMT=ext3
- MKE2FSOPT=-j
-}
+cd $DATAPATH/
-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 consolescroll ]
+then
+ ./consolescroll
+fi
- 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
-}
+for TARGETFILE in zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
+do
+ if [ -e $TARGETFILE ]
+ then
+ rm -f $TMPPATH/*.bin > /dev/null 2>&1
+ DATASIZE=`wc -c $TARGETFILE`
+ DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
-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
+ #echo $TARGETFILE':'$DATASIZE'bytes'
+ TARGETTYPE=Invalid
+ case "$TARGETFILE" in
+ zImage) TARGETTYPE=Kernel;;
+ zimage.bin) TARGETTYPE=Kernel;;
+ ZIMAGE) TARGETTYPE=Kernel;;
+ initrd.bin) TARGETTYPE=RoFs;;
+ INITRD.BIN) TARGETTYPE=RoFs;;
+ mversion.bin) TARGETTYPE=MasterVer;;
+ MVERSION.BIN) TARGETTYPE=MasterVer;;
+ *)
+ continue
+ ;;
+ esac
+ case "$TARGETTYPE" in
+ Kernel)
+ echo 'kernel'
+ ISLOGICAL=1
+ MODULEID=5
+ MODULESIZE=0x13C000
+ ADDR=`dc 0xE0000`
+ ISFORMATTED=1
+ DATAPOS=0
+ ONESIZE=524288
+ HDTOP=`expr $DATASIZE - 16`
+ /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE
+ ;;
+ RoFs)
+ echo 'RO file system'
+ ISLOGICAL=0
+ MODULEID=6
+ MODULESIZE=0x1E00000
+ ADDR=0
+ ISFORMATTED=0
+ TARGET_MTD=$RO_MTD
+ DATAPOS=16
+ ONESIZE=1048576
+ /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
+ ;;
+ MasterVer)
+ echo 'Maser version'
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ /sbin/verchg -m $MTMPNAME $TARGETFILE 0 0 > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ echo 'Success!'
+ continue
+ ;;
+ *)
+ continue;
+ ;;
+ esac
- mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
- if [ "$?" != "0" ]; then
- echo "ERROR: Unable to mount microdrive!"
- exit "$?"
- 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
- cd /hdd1
- echo 'Now extracting...'
- gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
- if [ "$?" != "0" ]; then
- echo "ERROR: Unable to extract root filesystem archive!"
- exit "$?"
- fi
+ #format?
+ if [ $ISFORMATTED = 0 ]
+ then
+ echo -n 'Flash erasing...'
+ /sbin/eraseall $TARGET_MTD 2> /dev/null > /dev/null
+ #/sbin/eraseall $TARGET_MTD 2
+ echo 'done'
+ ISFORMATTED=1
+ fi
- echo 'Done.'
+ echo ''
+ echo '0% 100%'
+ PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
+ PROGSTEP=`expr 28 / $PROGSTEP`
+ if [ $PROGSTEP = 0 ]
+ then
+ PROGSTEP=1
+ fi
- # remount as RO
- cd /
- umount /hdd1
- mount -t $LINUXFMT -o ro,noatime /dev/${IDE1}1 /hdd1
-}
+ #header information
+ 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
-do_flashing()
-{
- if [ $DATASIZE > $MTD_PART_SIZE ]
- then
- echo "ERROR: File is too big to flash!"
- return
- fi
+ #echo 'found header'
+ /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
+ /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
+ fi
- if [ $ISFORMATTED = 0 ]
- then
- echo -n 'Flash erasing...'
- /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
- echo 'done'
- ISFORMATTED=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`
- echo ''
- echo '0% 100%'
- PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
- PROGSTEP=`expr 25 / $PROGSTEP`
- if [ $PROGSTEP = 0 ]
- then
- PROGSTEP=1
- fi
+ #handle data file
+ #echo 'ADDR='$ADDR
+ #echo 'SIZE='$TMPSIZE
+ 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
- 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
+ rm $TMPDATA > /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
+ #progress
+ SPNUM=0
+ while [ $SPNUM -lt $PROGSTEP ]
+ do
+ echo -n '.'
+ SPNUM=`expr $SPNUM + 1`
+ done
+ done
- #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`
+ echo ''
- #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
+#finish
+ rm -f $TMPPATH/*.bin > /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
-
- 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
+ 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 'Success!'
+ else
+ echo 'Error!'
+# exit $RESULT
+ fi
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
-}
+done
-### 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-C760|SL-C860|SL-7500)
- ZAURUS='c7x0'
- ROOTFS_SIZE=0x1900000
- ;;
- 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
+#exit 0
-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
+echo 'Please reset'
+while true
do
- if [ ! -e $TARGETFILE ]
- then
- continue
- done
-
- rm -f $TMPPATH/*.bin > /dev/null 2>&1
- DATASIZE=`wc -c $TARGETFILE`
- DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
-
- # make TARGETFILE lowercase
- TARGETFILE=`echo $TERGETFILE|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=0
- ONESIZE=1048576
- DATAPOS=16
- /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
- do_flashing
- ;;
-
- hdimage1.tgz)
- if [ $UNPACKED_ROOTFS = 0 ]
- then
- do_rootfs_extraction
- fi
- ;;
-
- *)
- ;;
- esac
done
-
-# starting shell to test -- remove this from final release
-/bin/sh
-
-# 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 eb65c6997de97b055d134ef9ed8b86d2866c399c
+++ packages/zaurus-updater/zaurus-updater.bb 8f431da1e46051baa0e8fb2ca9012101c3146fea
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r6"
+PR = "r7"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
#
# mt diff -r9035f9a5f71e2ba479a0c67ef3e603dd91fe4cee -r1168c6045fce975d6d8f7098c478705bea1622c8
#
#
#
# add_dir "packages/fakeroot/fakeroot-1.8.3"
#
# add_dir "packages/fakeroot/fakeroot-native-1.8.3"
#
# add_dir "packages/telepathy/telepathy-inspector"
#
# add_file "packages/cairo/cairo_1.5.2.bb"
# content [61ddfc185aa2d1f7fb4bc91ae98db46f73d39ff5]
#
# add_file "packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch"
# content [ddf734d57653c19b37686145fcb06e0a3b0f541a]
#
# add_file "packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch"
# content [ddf734d57653c19b37686145fcb06e0a3b0f541a]
#
# add_file "packages/fakeroot/fakeroot-native_1.8.3.bb"
# content [7407435ed787b345bb9a3d69762a1616144a29a0]
#
# add_file "packages/fakeroot/fakeroot_1.8.3.bb"
# content [534172d2aa3a4939aaced19e321eacaad90ec58d]
#
# add_file "packages/linux/linux-openmoko/fix-gta01-flowcontrol2-2.6.22.5.patch"
# content [56a57f6952242830f10f4a303646dee421f15343]
#
# add_file "packages/linux/linux-openmoko-devel/fix-gta01-flowcontrol2-2.6.23.patch"
# content [d1e093164b7e15f22364201ed31b1c3c5aa47cf2]
#
# add_file "packages/telepathy/telepathy-inspector/scons-workaround.patch"
# content [72681eaeae3dc492fab9127426cff9c0e1d06b20]
#
# add_file "packages/telepathy/telepathy-inspector_0.5.0.bb"
# content [c7d57b051494d008dda63b66614bb24b396e5fc9]
#
# add_file "packages/xorg-lib/pixman_0.9.6.bb"
# content [3d3e4b3be3e009f2be58fd39ca4efb0a637f2aa1]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [913ecac98860fe4b30ebace43de31d2b0170a40b]
# to [c758ebcd1f9fc1a757ac3f4ee5a8678f23923052]
#
# patch "packages/base-files/base-files/slugos/fstab"
# from [0a626ecac204b0c3f9ce6016bed4cca0644b70e3]
# to [b8325640b68e3d314223fa96ee7ffc7e5e598574]
#
# patch "packages/cairo/cairo.inc"
# from [f6a2585841fd4108f8f95132b15872c98a0521ee]
# to [2c8c076b1e4a872edfb40b02d5b1413317db90b7]
#
# patch "packages/cairo/cairo_git.bb"
# from [dd7161f8e758e0a6da0647250f2845ac50953f43]
# to [07ea46dbd643eb1fe35f803ad4378a3cf6abbda9]
#
# patch "packages/linux/linux-ezx-2.6.23/a780/defconfig"
# from [e941dce52ebce9f863e32e0b94b9b4b2d34169df]
# to [b275e2c7df1de45f5fb7e065b207c4427b79b22d]
#
# patch "packages/linux/linux-ezx_2.6.23.bb"
# from [50f4589a2f72c7f5d91c29d0cc05fe83cde5193d]
# to [9a2603bc3690e0fabdce03bdc1fe5ad27517c778]
#
# patch "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
# from [536faa2e26f78ec89f681668ce27abcce2a7bdfd]
# to [d8c0a60cf3d44fde268cd5571825b0a7b83cbfa2]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [571fd28022bae3a5c980308fe93af3ce330dd293]
# to [a346ec71a75efeddc7673df7f64fd3f4e8dbfad3]
#
============================================================
--- packages/cairo/cairo_1.5.2.bb 61ddfc185aa2d1f7fb4bc91ae98db46f73d39ff5
+++ packages/cairo/cairo_1.5.2.bb 61ddfc185aa2d1f7fb4bc91ae98db46f73d39ff5
@@ -0,0 +1,8 @@
+require cairo.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+PR = "r0"
+
============================================================
--- packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch ddf734d57653c19b37686145fcb06e0a3b0f541a
+++ packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch ddf734d57653c19b37686145fcb06e0a3b0f541a
@@ -0,0 +1,18 @@
+--- fakeroot-1.8.3/configure.ac.orig 2007-10-31 00:17:27.000000000 -0500
++++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500
+@@ -1,14 +1,12 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo at debian.org],[fakeroot])
+ AC_PREREQ(2.61)
+-LT_PREREQ(2.1a)
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_MAKE_SET
+-LT_INIT
+-LT_LANG(C)
++AC_PROG_LIBTOOL
+
+ AC_ARG_WITH([ipc],
+ AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
============================================================
--- packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch ddf734d57653c19b37686145fcb06e0a3b0f541a
+++ packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch ddf734d57653c19b37686145fcb06e0a3b0f541a
@@ -0,0 +1,18 @@
+--- fakeroot-1.8.3/configure.ac.orig 2007-10-31 00:17:27.000000000 -0500
++++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500
+@@ -1,14 +1,12 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo at debian.org],[fakeroot])
+ AC_PREREQ(2.61)
+-LT_PREREQ(2.1a)
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_MAKE_SET
+-LT_INIT
+-LT_LANG(C)
++AC_PROG_LIBTOOL
+
+ AC_ARG_WITH([ipc],
+ AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
============================================================
--- packages/fakeroot/fakeroot-native_1.8.3.bb 7407435ed787b345bb9a3d69762a1616144a29a0
+++ packages/fakeroot/fakeroot-native_1.8.3.bb 7407435ed787b345bb9a3d69762a1616144a29a0
@@ -0,0 +1,20 @@
+SECTION = "base"
+require fakeroot_${PV}.bb
+inherit native
+RDEPENDS="util-linux-native"
+
+SRC_URI += "file://fix-prefix.patch;patch=1 "
+S = "${WORKDIR}/fakeroot-${PV}"
+
+EXTRA_OECONF = " --program-prefix="
+
+# Compatability for the rare systems not using or having SYSV
+python () {
+ if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0':
+ bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d)
+}
+
+do_stage_append () {
+ oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
+}
+
============================================================
--- packages/fakeroot/fakeroot_1.8.3.bb 534172d2aa3a4939aaced19e321eacaad90ec58d
+++ packages/fakeroot/fakeroot_1.8.3.bb 534172d2aa3a4939aaced19e321eacaad90ec58d
@@ -0,0 +1,17 @@
+DESCRIPTION = "Gives a fake root environment"
+SECTION = "base"
+LICENSE = "GPL"
+# fakeroot needs getopt which is provided by the util-linux package
+RDEPENDS = "util-linux"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz \
+ file://configure-libtool.patch;patch=1"
+
+inherit autotools
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/fakeroot
+ install -m 644 *.h ${STAGING_INCDIR}/fakeroot
+ autotools_stage_all
+}
============================================================
--- packages/linux/linux-openmoko/fix-gta01-flowcontrol2-2.6.22.5.patch 56a57f6952242830f10f4a303646dee421f15343
+++ packages/linux/linux-openmoko/fix-gta01-flowcontrol2-2.6.22.5.patch 56a57f6952242830f10f4a303646dee421f15343
@@ -0,0 +1,193 @@
+--- linux-2.6.22.5/arch/arm/common/gta01_pm_gsm.c.orig 2007-09-27 11:23:20.000000000 -0500
++++ linux-2.6.22.5/arch/arm/common/gta01_pm_gsm.c 2007-09-27 21:09:00.000000000 -0500
+@@ -23,6 +23,9 @@
+ #include <asm/arch/gta01.h>
+ #include <asm/arch/gta02.h>
+
++#include <linux/serial_core.h>
++void s3c24xx_set_flow_control(struct uart_port *port, int fc_on);
++
+ struct gta01pm_priv {
+ int gpio_ngsm_en;
+ struct console *con;
+@@ -49,6 +52,23 @@
+ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
+ char *buf)
+ {
++ struct uart_driver *udrive = NULL;
++ struct uart_state *ustate = NULL;
++ struct uart_port *uport = NULL;
++
++ if (gta01_gsm.con) {
++ udrive = gta01_gsm.con->data;
++ if (udrive) {
++ ustate = udrive->state;
++ if (ustate) {
++ uport = ustate->port;
++ }
++ }
++ }
++ printk("gsm: gsm_read of \"%s\"\n", attr->attr.name);
++ printk("gsm: con=%p udrive=%p ustate=%p uport=%p\n",
++ gta01_gsm.con, udrive, ustate, uport);
++
+ if (!strcmp(attr->attr.name, "power_on")) {
+ if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
+ goto out_1;
+@@ -58,6 +78,24 @@
+ } else if (!strcmp(attr->attr.name, "download")) {
+ if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
+ goto out_1;
++ } else if (!strcmp(attr->attr.name, "flowcontrol")) {
++ if (uport) {
++ if (uport->unused[2] & 0x2) {
++ if (uport->unused[2] & 0x1) {
++ printk("gsm: flow control allowed and on\n");
++ goto out_1;
++ } else {
++ printk("gsm: flow control allowed and not on\n");
++ }
++ } else {
++ if (uport->unused[2] & 0x1)
++ printk("gsm: flow control not allowed, "
++ "but is pending\n");
++ else
++ printk("gsm: flow control not allowed, "
++ "not pending\n");
++ }
++ }
+ }
+
+ return strlcpy(buf, "0\n", 3);
+@@ -68,10 +106,26 @@
+ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+ {
++ struct uart_driver *udrive = NULL;
++ struct uart_state *ustate = NULL;
++ struct uart_port *uport = NULL;
++ static int was_on = 0;
+ unsigned long on = simple_strtoul(buf, NULL, 10);
+
++ if (gta01_gsm.con) {
++ udrive = gta01_gsm.con->data;
++ if (udrive) {
++ ustate = udrive->state;
++ if (ustate) {
++ uport = ustate->port;
++ }
++ }
++ }
++ printk("gsm: con=%p udrive=%p ustate=%p uport=%p\n",
++ gta01_gsm.con, udrive, ustate, uport);
++
+ if (!strcmp(attr->attr.name, "power_on")) {
+- if (on) {
++ if (on && !was_on) {
+ if (gta01_gsm.con) {
+ dev_info(dev, "powering up GSM, thus "
+ "disconnecting serial console\n");
+@@ -83,7 +137,24 @@
+ s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 0);
+
+ s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
+- } else {
++
++ if (uport) {
++ /* set any pending flow-control mode */
++ uport->unused[2] |= 0x2;
++ s3c24xx_set_flow_control(uport,
++ (uport->unused[2] & 0x1));
++ dev_info(dev, "flow control allowed\n");
++ }
++
++ was_on = 1;
++
++ } else if (!on && was_on) {
++ if (uport) {
++ uport->unused[2] &= ~0x2;
++ s3c24xx_set_flow_control(uport, 0);
++ dev_info(dev, "flow control not allowed\n");
++ }
++
+ s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
+
+ if (gta01_gsm.gpio_ngsm_en)
+@@ -95,6 +166,8 @@
+ dev_info(dev, "powered down GSM, thus enabling "
+ "serial console\n");
+ }
++
++ was_on = 0;
+ }
+ } else if (!strcmp(attr->attr.name, "reset")) {
+ s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
+@@ -105,6 +178,7 @@
+ return count;
+ }
+
++static DEVICE_ATTR(flowcontrol, 0644, gsm_read, gsm_write);
+ static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write);
+ static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
+ static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
+@@ -136,6 +210,7 @@
+ #endif
+
+ static struct attribute *gta01_gsm_sysfs_entries[] = {
++ &dev_attr_flowcontrol.attr,
+ &dev_attr_power_on.attr,
+ &dev_attr_reset.attr,
+ NULL,
+--- linux-2.6.22.5/drivers/serial/s3c2410.c.orig 2007-09-27 11:23:27.000000000 -0500
++++ linux-2.6.22.5/drivers/serial/s3c2410.c 2007-09-27 21:07:21.000000000 -0500
+@@ -80,6 +80,8 @@
+
+ #include <asm/arch/regs-serial.h>
+ #include <asm/arch/regs-gpio.h>
++#include <asm/mach-types.h>
++#include <asm/arch/gta01.h>
+
+ /* structures */
+
+@@ -729,6 +731,17 @@
+ return best->quot;
+ }
+
++/* This routine is called whenever the gta01 modem/console switches */
++void s3c24xx_set_flow_control(struct uart_port *port, int fc_on)
++{
++ unsigned int umcon;
++ if (machine_is_neo1973_gta01() && port) {
++ umcon = (fc_on) ? S3C2410_UMCOM_AFC : 0;
++ wr_regl(port, S3C2410_UMCON, umcon);
++ }
++}
++EXPORT_SYMBOL(s3c24xx_set_flow_control);
++
+ static void s3c24xx_serial_set_termios(struct uart_port *port,
+ struct ktermios *termios,
+ struct ktermios *old)
+@@ -803,6 +816,23 @@
+
+ umcon = (termios->c_cflag & CRTSCTS) ? S3C2410_UMCOM_AFC : 0;
+
++ /*
++ * Custom handling of flow control on hwport 0 for the GTA01:
++ * Save the desired state for flow control, but if the port
++ * is being used as a console, then do not actually enable
++ * flow control unless the flag permiting us to do so is set.
++ */
++ if (machine_is_neo1973_gta01() && (cfg->hwport == 0)) {
++ if (umcon)
++ port->unused[2] |= 0x1;
++ else
++ port->unused[2] &= ~0x1;
++ if (port->cons && (port->cons->index >= 0)) {
++ if (!(port->unused[2] & 0x2))
++ umcon = 0;
++ }
++ }
++
+ if (termios->c_cflag & PARENB) {
+ if (termios->c_cflag & PARODD)
+ ulcon |= S3C2410_LCON_PODD;
============================================================
--- packages/linux/linux-openmoko-devel/fix-gta01-flowcontrol2-2.6.23.patch d1e093164b7e15f22364201ed31b1c3c5aa47cf2
+++ packages/linux/linux-openmoko-devel/fix-gta01-flowcontrol2-2.6.23.patch d1e093164b7e15f22364201ed31b1c3c5aa47cf2
@@ -0,0 +1,193 @@
+--- linux-2.6.23/arch/arm/common/gta01_pm_gsm.c.orig 2007-10-30 23:29:53.000000000 -0500
++++ linux-2.6.23/arch/arm/common/gta01_pm_gsm.c 2007-10-30 23:35:44.000000000 -0500
+@@ -23,6 +23,9 @@
+ #include <asm/arch/gta01.h>
+ #include <asm/arch/gta02.h>
+
++#include <linux/serial_core.h>
++void s3c24xx_set_flow_control(struct uart_port *port, int fc_on);
++
+ struct gta01pm_priv {
+ int gpio_ngsm_en;
+ struct console *con;
+@@ -49,6 +52,23 @@
+ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
+ char *buf)
+ {
++ struct uart_driver *udrive = NULL;
++ struct uart_state *ustate = NULL;
++ struct uart_port *uport = NULL;
++
++ if (gta01_gsm.con) {
++ udrive = gta01_gsm.con->data;
++ if (udrive) {
++ ustate = udrive->state;
++ if (ustate) {
++ uport = ustate->port;
++ }
++ }
++ }
++ printk("gsm: gsm_read of \"%s\"\n", attr->attr.name);
++ printk("gsm: con=%p udrive=%p ustate=%p uport=%p\n",
++ gta01_gsm.con, udrive, ustate, uport);
++
+ if (!strcmp(attr->attr.name, "power_on")) {
+ if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
+ goto out_1;
+@@ -58,6 +78,24 @@
+ } else if (!strcmp(attr->attr.name, "download")) {
+ if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
+ goto out_1;
++ } else if (!strcmp(attr->attr.name, "flowcontrol")) {
++ if (uport) {
++ if (uport->unused[2] & 0x2) {
++ if (uport->unused[2] & 0x1) {
++ printk("gsm: flow control allowed and on\n");
++ goto out_1;
++ } else {
++ printk("gsm: flow control allowed and not on\n");
++ }
++ } else {
++ if (uport->unused[2] & 0x1)
++ printk("gsm: flow control not allowed, "
++ "but is pending\n");
++ else
++ printk("gsm: flow control not allowed, "
++ "not pending\n");
++ }
++ }
+ }
+
+ return strlcpy(buf, "0\n", 3);
+@@ -68,10 +106,26 @@
+ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+ {
++ struct uart_driver *udrive = NULL;
++ struct uart_state *ustate = NULL;
++ struct uart_port *uport = NULL;
++ static int was_on = 0;
+ unsigned long on = simple_strtoul(buf, NULL, 10);
+
++ if (gta01_gsm.con) {
++ udrive = gta01_gsm.con->data;
++ if (udrive) {
++ ustate = udrive->state;
++ if (ustate) {
++ uport = ustate->port;
++ }
++ }
++ }
++ printk("gsm: con=%p udrive=%p ustate=%p uport=%p\n",
++ gta01_gsm.con, udrive, ustate, uport);
++
+ if (!strcmp(attr->attr.name, "power_on")) {
+- if (on) {
++ if (on && !was_on) {
+ if (gta01_gsm.con) {
+ dev_info(dev, "powering up GSM, thus "
+ "disconnecting serial console\n");
+@@ -83,7 +137,24 @@
+ s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 0);
+
+ s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
+- } else {
++
++ if (uport) {
++ /* set any pending flow-control mode */
++ uport->unused[2] |= 0x2;
++ s3c24xx_set_flow_control(uport,
++ (uport->unused[2] & 0x1));
++ dev_info(dev, "flow control allowed\n");
++ }
++
++ was_on = 1;
++
++ } else if (!on && was_on) {
++ if (uport) {
++ uport->unused[2] &= ~0x2;
++ s3c24xx_set_flow_control(uport, 0);
++ dev_info(dev, "flow control not allowed\n");
++ }
++
+ s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
+
+ if (gta01_gsm.gpio_ngsm_en)
+@@ -95,6 +166,8 @@
+ dev_info(dev, "powered down GSM, thus enabling "
+ "serial console\n");
+ }
++
++ was_on = 0;
+ }
+ } else if (!strcmp(attr->attr.name, "reset")) {
+ s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
+@@ -105,6 +178,7 @@
+ return count;
+ }
+
++static DEVICE_ATTR(flowcontrol, 0644, gsm_read, gsm_write);
+ static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write);
+ static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
+ static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
+@@ -136,6 +210,7 @@
+ #endif
+
+ static struct at%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list