[oe-commits] org.oe.dev merge of '15ad25c2df41e72ad281610da11230b4d0c9bd20'

oe commit openembedded-commits at lists.openembedded.org
Sun Jan 6 07:34:03 UTC 2008


merge of '15ad25c2df41e72ad281610da11230b4d0c9bd20'
     and '5bfb1624d0726e9c07b5b20f7ecccb236fee357c'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 73e3330d157462c57356d2a900f1720608684829
ViewMTN: http://monotone.openembedded.org/revision/info/73e3330d157462c57356d2a900f1720608684829
Files:
1
packages/linux/mainstone-kernel/mainstone
packages/linux/mainstone-kernel/flash-unlock.patch
packages/linux/mainstone-kernel/mainstone/defconfig
packages/linux/mainstone-kernel_2.6.18.bb
packages/openmoko-apps/files/openmoko-gps.desktop
packages/speech-dispatcher/files/confSpeechd.conf_00.patch
packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1
packages/xcursor-transparent-theme/files
packages/gnome-mplayer/files/non-utf8-id3-fallback.patch
packages/gnome-mplayer/files/uchar-for-utf8-check.patch
packages/gpsd/files/fic-gta01/restart_gllin.sh
packages/navit/files/navit.launcher
packages/python/python-gsmd_svn.bb
packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
packages/speech-dispatcher/files/speech-dispatcher.init
packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
conf/distro/include/moko-autorev.inc
packages/espeak/espeak_1.30.bb
packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
packages/gnome-mplayer/gnome-mplayer_cvs.bb
packages/gpsd/gpsd.inc
packages/gpsd/gpsd_2.28.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/tasks/task-python-everything.bb
packages/u-boot/u-boot-openmoko_svn.bb
Diffs:

#
# mt diff -r15ad25c2df41e72ad281610da11230b4d0c9bd20 -r73e3330d157462c57356d2a900f1720608684829
#
# 
# 
# add_dir "packages/linux/mainstone-kernel/mainstone"
# 
# add_file "packages/linux/mainstone-kernel/flash-unlock.patch"
#  content [7dcbf9e486b99c782a1cc8675ea74ac65309624a]
# 
# add_file "packages/linux/mainstone-kernel/mainstone/defconfig"
#  content [6bfaae48053fbadbfdc06b87b0900b8e791f8079]
# 
# patch "packages/linux/mainstone-kernel_2.6.18.bb"
#  from [08ce2daf2b8f1e478a29ccade5b10df1891a1bbc]
#    to [06ce52f0eac17560e7f0c7163cfdd585c005ac3c]
# 
============================================================
--- packages/linux/mainstone-kernel/flash-unlock.patch	7dcbf9e486b99c782a1cc8675ea74ac65309624a
+++ packages/linux/mainstone-kernel/flash-unlock.patch	7dcbf9e486b99c782a1cc8675ea74ac65309624a
@@ -0,0 +1,14 @@
+--- drivers/mtd/maps/mainstone-flash.c~	2008-01-05 01:15:54.000000000 +0100
++++ drivers/mtd/maps/mainstone-flash.c	2008-01-05 01:15:54.000000000 +0100
+@@ -125,6 +125,11 @@
+ 			continue;
+ 		}
+ 		mymtds[i]->owner = THIS_MODULE;
++		
++		/* Unlock the flash device. */
++                if (mymtds[i]->unlock)
++                        mymtds[i]->unlock(mymtds[i], 0, mymtds[i]->size);
++		                                        
+ 
+ 		ret = parse_mtd_partitions(mymtds[i], probes,
+ 					   &parsed_parts[i], 0);
============================================================
--- packages/linux/mainstone-kernel/mainstone/defconfig	6bfaae48053fbadbfdc06b87b0900b8e791f8079
+++ packages/linux/mainstone-kernel/mainstone/defconfig	6bfaae48053fbadbfdc06b87b0900b8e791f8079
@@ -0,0 +1,1276 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.18
+# Sun Jan  6 00:54:23 2008
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+CONFIG_MACH_MAINSTONE=y
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
+CONFIG_PXA27x=y
+CONFIG_IWMMXT=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+CONFIG_XSCALE_PMU=y
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=m
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M console=ttyS0 debug "
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_APM=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+# CONFIG_IRLAN is not set
+# CONFIG_IRNET is not set
+# CONFIG_IRCOMM is not set
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_PXA_FICP is not set
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+# CONFIG_BT_L2CAP is not set
+# CONFIG_BT_SCO is not set
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIUSB is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+# CONFIG_MTD_CFI_I1 is not set
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_MAINSTONE=y
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r5bfb1624d0726e9c07b5b20f7ecccb236fee357c -r73e3330d157462c57356d2a900f1720608684829
#
# 
# 
# delete "packages/openmoko-apps/files/openmoko-gps.desktop"
# 
# delete "packages/speech-dispatcher/files/confSpeechd.conf_00.patch"
# 
# rename "packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb"
#     to "packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb"
# 
# rename "packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1"
#     to "packages/xcursor-transparent-theme/files"
# 
# add_file "packages/gnome-mplayer/files/non-utf8-id3-fallback.patch"
#  content [be331e8a429578785b64fac01b7c17b2d423d0ad]
# 
# add_file "packages/gnome-mplayer/files/uchar-for-utf8-check.patch"
#  content [dd50b5684926b93e6f64361f6b3a9a63a3ee7d30]
# 
# add_file "packages/gpsd/files/fic-gta01/restart_gllin.sh"
#  content [1dd563bb0bc587c3b75094aef643c8ddc47c7942]
# 
# add_file "packages/navit/files/navit.launcher"
#  content [27112f09960b2c81d820fef3fe2b712926754667]
# 
# add_file "packages/python/python-gsmd_svn.bb"
#  content [f544c0a64dbe8cc30141c6eca19d93a819db7b5c]
# 
# add_file "packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch"
#  content [001e9d4108977248cedd50752029192824293596]
# 
# add_file "packages/speech-dispatcher/files/speech-dispatcher.init"
#  content [c2d6965815b005c0d9ab696cbca0d2edb3c39bfd]
# 
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb"
#  content [96f40a33b74048e73d3054500e402469dc47f737]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [bfb54642af40a5440c951be6f7f4845770a7fb31]
#    to [2f7cb2290c8041be1845553e70a09af8c92e718d]
# 
# patch "packages/espeak/espeak_1.30.bb"
#  from [81d52cdf97440599166ddf3cf05b7e750c5bc59d]
#    to [0b187e4c430c8a401c4d5bd39c356847ef639578]
# 
# patch "packages/gnome-mplayer/gnome-mplayer_0.5.3.bb"
#  from [b00f87db280275a3091590e1be9b6b2521f36643]
#    to [39e57ed5f730fc922e3312502b843219942d12cf]
# 
# patch "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
#  from [f29e0cf247b2a273218db171e5ce4b72187cc304]
#    to [c34de96207774639cc00196181f1fb56aadbf586]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [650373a23ddc8159bfc209e03a8bb60a2f5c46e4]
#    to [31c98872bb132b08fab52b701f0d91b961f71d9b]
# 
# patch "packages/gpsd/gpsd_2.28.bb"
#  from [19dc03378642fa1ee106c4bf1ba4f49118860903]
#    to [55b0e4d9cd1f621bd6f0f8049044f2512a411011]
# 
# patch "packages/gpsd/gpsd_2.34.bb"
#  from [d07d745ca471b1b1cfe875690c9278e223ca2c9c]
#    to [968a1c12ab0cf22874a5a029daa69b00eedac21c]
# 
# patch "packages/gpsd/gpsd_2.36.bb"
#  from [9cabcd04b6334d04f5b20d7585ad5d051f19a06f]
#    to [e7423c783c6edfa634685a22f2821e44fa28c764]
# 
# patch "packages/navit/navit.inc"
#  from [926adcffc6471b5c8bf96d43d6eaf5c81bd2debf]
#    to [dc36e11d9155034cfe2c407959f0b757b5a483de]
# 
# patch "packages/navit/navit_0.0.3.bb"
#  from [bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0]
#    to [1127602c440a00440088e7587bf88d3c760f05c4]
# 
# patch "packages/navit/navit_cvs.bb"
#  from [537deb351fc223dc40a33d489f2edf10bd7f67dd]
#    to [d22f4f689826ebf7d008a0bc66a88d56cc149e05]
# 
# patch "packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb"
#  from [4274e6a3673edc5493b4f3227e02987d79cb0426]
#    to [e4035dc1718202321026ab8029c97d31352cb70c]
# 
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
#  from [4c119ef83390203d6cbc5962db26ac4ec8ed6733]
#    to [c0404c61c7a8cf7050862abc2771e72e634cf323]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [3729081d243f947b170d93ab5c2e5503ee8fe392]
#    to [67974c31da8be9bcedbda9f7dfa5963f89e262a2]
# 
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
#  from [67ec27434d36f171aedd9fb4e06f390505792635]
#    to [d812cd2b7484ad3d696a1616eea6e3e80706d31c]
# 
============================================================
--- packages/gnome-mplayer/files/non-utf8-id3-fallback.patch	be331e8a429578785b64fac01b7c17b2d423d0ad
+++ packages/gnome-mplayer/files/non-utf8-id3-fallback.patch	be331e8a429578785b64fac01b7c17b2d423d0ad
@@ -0,0 +1,22 @@
+I found that on ARM/glibc 2.5/glib 2.12.something test in strip_unicode() doesn't
+really catch invalid utf-8 chars. Also, let's tell user where problem lies straight.
+
+Paul Sokolovsky <pmiscml at gmail.com>
+--- a/src/thread.c.org	2007-12-24 00:10:15.000000000 +0200
++++ a/src/thread.c	2008-01-04 22:04:30.000000000 +0200
+@@ -349,13 +349,11 @@
+ 					//g_idle_add(set_media_info, idledata);
+ 					utf8name = g_locale_to_utf8(parse[name],-1, NULL, NULL,NULL);
+ 					if (utf8name == NULL) {
+-						strip_unicode(parse[name],strlen(parse[name]));
+-						utf8name = g_strdup(parse[name]);
++						utf8name = g_strdup("<cannot convert to utf-8>");
+ 					}
+ 					utf8artist = g_locale_to_utf8(parse[artist],-1, NULL, NULL,NULL);
+ 					if (utf8artist == NULL) {
+-						strip_unicode(parse[artist],strlen(parse[artist]));
+-						utf8artist = g_strdup(parse[artist]);
++						utf8artist = g_strdup("<cannot convert to utf-8>");
+ 					}
+ 					
+ 					message = g_markup_printf_escaped(_("<small>\n<b>Title:</b>\t%s\n<b>Artist:</b>\t%s\n<b>File:</b>\t%s\n</small>"),utf8name,utf8artist,idledata->info);
============================================================
--- packages/gnome-mplayer/files/uchar-for-utf8-check.patch	dd50b5684926b93e6f64361f6b3a9a63a3ee7d30
+++ packages/gnome-mplayer/files/uchar-for-utf8-check.patch	dd50b5684926b93e6f64361f6b3a9a63a3ee7d30
@@ -0,0 +1,22 @@
+--- a/src/support.c.org	2007-12-18 20:39:09.000000000 +0200
++++ a/src/support.c	2008-01-04 22:12:32.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ #include "support.h"
+ 
+-void strip_unicode(gchar * data, gsize len)
++void strip_unicode(guchar * data, gsize len)
+ {
+     gsize i = 0;
+ 
+--- a/src/support.h.org	2007-12-17 18:21:46.000000000 +0200
++++ a/src/support.h	2008-01-04 22:24:15.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
+-void strip_unicode(gchar * data, gsize len);
++void strip_unicode(guchar * data, gsize len);
+ gint play_file(gchar * filename, gint playlist);
+ gint detect_playlist(gchar * filename);
+ gint parse_playlist(gchar * filename);
============================================================
--- packages/gpsd/files/fic-gta01/restart_gllin.sh	1dd563bb0bc587c3b75094aef643c8ddc47c7942
+++ packages/gpsd/files/fic-gta01/restart_gllin.sh	1dd563bb0bc587c3b75094aef643c8ddc47c7942
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/etc/init.d/gps-hardware stop
+sleep 1
+/etc/init.d/gps-hardware start
+
============================================================
--- packages/navit/files/navit.launcher	27112f09960b2c81d820fef3fe2b712926754667
+++ packages/navit/files/navit.launcher	27112f09960b2c81d820fef3fe2b712926754667
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: navit.launcher
+# Date: 20080105 (YMD)
+#
+#################################################################################
+#
+# 20080105 - v0.0.1	- Initial release
+
+# On devices with low memory (< 512Mb?) Navit will segfault on start.
+# This can be worked around by doing
+# "echo 1 > /proc/sys/vm/overcommit_memory"
+
+if test "`cat /proc/meminfo | grep ^MemTotal | awk '{print $2}'`" -lt "500000"
+then
+	if test "$USER" = "root"
+	then
+		echo "Enabling low-mem workaround..."
+		echo 1 > /proc/sys/vm/overcommit_memory
+	else
+		echo "I need root-privs to enable the low-mem workaround!"
+	fi
+fi
+
+navit.real $*
+	
+
============================================================
--- packages/python/python-gsmd_svn.bb	f544c0a64dbe8cc30141c6eca19d93a819db7b5c
+++ packages/python/python-gsmd_svn.bb	f544c0a64dbe8cc30141c6eca19d93a819db7b5c
@@ -0,0 +1,15 @@
+DESCRIPTION = "Python bindings for the libgsmd"
+SRCNAME = "python-gsmd"
+AUTHOR = "Sudharshan S"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "libgsmd"
+PV = "0.02+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/python-openmoko;module=python-gsmd;proto=http"
+S = "${WORKDIR}/python-gsmd"
+
+SRCREV_pn-python-gsmd ?= "${AUTOREV}"
+
+inherit distutils
============================================================
--- packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch	001e9d4108977248cedd50752029192824293596
+++ packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch	001e9d4108977248cedd50752029192824293596
@@ -0,0 +1,33 @@
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig	2008-01-05 16:38:53.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in	2008-01-05 16:40:45.000000000 +0000
+@@ -36,7 +36,7 @@
+ # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
+ # want to influence it.
+ 
+-LogDir  "default"
++LogDir  "/var/log/"
+ #LogDir  "/var/log/speech-dispatcher/"
+ #LogDir  "stdout"
+ 
+@@ -129,9 +129,9 @@
+ #  - configuration is the path to the config file of this module,
+ #    either relative (to etc/speechd/modules/) or absolute
+ 
+-AddModule "espeak"       "sd_espeak"   "espeak.conf"
+-AddModule "festival"     "sd_festival"  "festival.conf"
+-AddModule "flite"        "sd_flite"     "flite.conf"
++AddModule "espeak"       "sd_espeak"   "/etc/speech-dispatcher/modules/espeak.conf"
++#AddModule "festival"     "sd_festival"  "festival.conf"
++#AddModule "flite"        "sd_flite"     "flite.conf"
+ #AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+ #AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
+ #AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
+@@ -172,6 +172,6 @@
+ 
+ # There are some sample client settings
+ 
+-Include "clients/emacs.conf"
+-Include "clients/gnome-speech.conf"
++#Include "clients/emacs.conf"
++#Include "clients/gnome-speech.conf"
+ 
============================================================
--- packages/speech-dispatcher/files/speech-dispatcher.init	c2d6965815b005c0d9ab696cbca0d2edb3c39bfd
+++ packages/speech-dispatcher/files/speech-dispatcher.init	c2d6965815b005c0d9ab696cbca0d2edb3c39bfd
@@ -0,0 +1,42 @@
+#! /bin/sh
+
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/speech-dispatcher
+PIDFILE=/var/run/speech-dispatcher.pid
+NAME=speech-dispatcher
+DESC='Speech Dispatcher'
+USER=speech-dispatcher
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo "Starting $NAME"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+          --exec $DAEMON
+
+	;;
+  stop)
+  	echo "Stopping $NAME"
+	start-stop-daemon --oknodo --stop --quiet \
+          --pidfile $PIDFILE --exec $DAEMON
+	;;
+  restart)
+	echo "Restarting $NAME"
+	start-stop-daemon --oknodo --stop --quiet \
+          --pidfile $PIDFILE --exec $DAEMON
+	sleep 3
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+          --exec $DAEMON
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb	96f40a33b74048e73d3054500e402469dc47f737
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb	96f40a33b74048e73d3054500e402469dc47f737
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch cursor"
+SECTION = "x11/base"
+RREPLACES = "xcursor-transparent-theme"
+RPROVIDES = "xcursor-transparent-theme"
+PR="r2"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
+	   file://use-relative-symlinks.patch;patch=1 \
+	   file://skip_watch_cursor.patch;patch=1"
+S = "${WORKDIR}/xcursor-transparent-theme-${PV}"
+
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+
+inherit autotools
============================================================
--- conf/distro/include/moko-autorev.inc	bfb54642af40a5440c951be6f7f4845770a7fb31
+++ conf/distro/include/moko-autorev.inc	2f7cb2290c8041be1845553e70a09af8c92e718d
@@ -44,6 +44,8 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
 
+SRCREV_pn-python-gsmd ?= "${AUTOREV}"
+
 SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
============================================================
--- packages/espeak/espeak_1.30.bb	81d52cdf97440599166ddf3cf05b7e750c5bc59d
+++ packages/espeak/espeak_1.30.bb	0b187e4c430c8a401c4d5bd39c356847ef639578
@@ -15,7 +15,7 @@ DEPENDS = "portaudio-v19"
 
 ######################################################################################
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-${PV}-source.zip"
 
@@ -44,3 +44,9 @@ do_install() {
 	
 	cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
 }
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/espeak
+	install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
+        oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
+}
============================================================
--- packages/gnome-mplayer/gnome-mplayer_0.5.3.bb	b00f87db280275a3091590e1be9b6b2521f36643
+++ packages/gnome-mplayer/gnome-mplayer_0.5.3.bb	39e57ed5f730fc922e3312502b843219942d12cf
@@ -1,12 +1,14 @@ RDEPENDS = "mplayer"
 DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
 HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gconf dbus-glib"
 RDEPENDS = "mplayer"
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig gconf
 
 SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \
     file://ac-gthread.patch;patch=1 \
+    file://1.patch;patch=1 \
+    file://uchar-for-utf8-check.patch;patch=1 \
+    file://non-utf8-id3-fallback.patch;patch=1"
-    file://1.patch;patch=1" 
============================================================
--- packages/gnome-mplayer/gnome-mplayer_cvs.bb	f29e0cf247b2a273218db171e5ce4b72187cc304
+++ packages/gnome-mplayer/gnome-mplayer_cvs.bb	c34de96207774639cc00196181f1fb56aadbf586
@@ -5,7 +5,7 @@ PV = "0.5.3+cvs${SRCDATE}"
 RDEPENDS = "mplayer"
 SRCDATE = "20080101"
 PV = "0.5.3+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig gconf
 
@@ -13,4 +13,6 @@ SRC_URI = "cvs://anonymous@dekorte.homei
 
 SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \
     file://ac-gthread.patch;patch=1 \
+    file://1.patch;patch=1 \
+    file://uchar-for-utf8-check.patch;patch=1 \
+    file://non-utf8-id3-fallback.patch;patch=1"
-    file://1.patch;patch=1"
============================================================
--- packages/gpsd/gpsd.inc	650373a23ddc8159bfc209e03a8bb60a2f5c46e4
+++ packages/gpsd/gpsd.inc	31c98872bb132b08fab52b701f0d91b961f71d9b
@@ -15,6 +15,10 @@ SRC_URI = "http://download.berlios.de/gp
 	   file://gps-hardware \
            file://gpsd"
 
+SRC_URI_append_fic-gta01 = " \
+			    file://restart_gllin.sh \
+			   "
+			   
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "gpsd"
@@ -48,6 +52,11 @@ do_install_append() {
         install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
 }
 
+do_install_append_fic-gta01() {
+	install -d ${D}/${sysconfdir}/apm/resume.d
+	install -m 755 ${WORKDIR}/restart_gllin.sh ${D}/${sysconfdir}/apm/resume.d
+}
+
 pkg_postinst_${PN}-conf() {
 	update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
 	update-alternatives --install ${sysconfdir}/init.d/gps-hardware gps-hardware ${sysconfdir}/init.d/gps-hardware.default 10
============================================================
--- packages/gpsd/gpsd_2.28.bb	19dc03378642fa1ee106c4bf1ba4f49118860903
+++ packages/gpsd/gpsd_2.28.bb	55b0e4d9cd1f621bd6f0f8049044f2512a411011
@@ -1,2 +1,2 @@ require gpsd.inc
 require gpsd.inc
+PR = "r8"
-PR = "r5"
============================================================
--- packages/gpsd/gpsd_2.34.bb	d07d745ca471b1b1cfe875690c9278e223ca2c9c
+++ packages/gpsd/gpsd_2.34.bb	968a1c12ab0cf22874a5a029daa69b00eedac21c
@@ -1,4 +1,4 @@ require gpsd.inc
 require gpsd.inc
 
-PR = "r7"
+PR = "r8"
 
============================================================
--- packages/gpsd/gpsd_2.36.bb	9cabcd04b6334d04f5b20d7585ad5d051f19a06f
+++ packages/gpsd/gpsd_2.36.bb	e7423c783c6edfa634685a22f2821e44fa28c764
@@ -1,3 +1,3 @@ require gpsd.inc
 require gpsd.inc
 
+PR = "r2"
-PR = "r1"
========================================================%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list