[oe-commits] org.oe.dev merge of '0daf2d0bb9de41fe64922b7a825b5de36229d3f2'

pfalcon commit openembedded-commits at lists.openembedded.org
Fri Jul 6 11:05:39 UTC 2007


merge of '0daf2d0bb9de41fe64922b7a825b5de36229d3f2'
     and 'f3bfa89a401bbe5f20aab265a69e2f5579a7cc15'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7e6adf2eba691057299d67aeff9562e39132c566
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7e6adf2eba691057299d67aeff9562e39132c566
Files:
1
packages/linux/linux-handhelds-2.6/htcapache
packages/linux/linux-handhelds-2.6/htcsable
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
conf/distro/angstrom-2007.1.conf
packages/perl/perl-5.8.8/native-makedepend-dash.patch
packages/gtkhtml/gtkhtml-3.6
packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
packages/libtool/libtool-1.5.10/rpath-control.patch
packages/perl/perl-5.8.8/asm-pageh-fix.patch
packages/perl/perl-5.8.8/makedepend-dash.patch
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/index.php
contrib/feed-browser/update.php
packages/gaim/pidgin.inc
packages/gaim/pidgin_2.0.2.bb
packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/perl/perl-native_5.8.8.bb
packages/perl/perl_5.8.8.bb
packages/qemu/qemu-native.inc
packages/qt/qt4_arch.inc
Diffs:

#
# mt diff -r0daf2d0bb9de41fe64922b7a825b5de36229d3f2 -r7e6adf2eba691057299d67aeff9562e39132c566
#
# 
# 
# add_dir "packages/linux/linux-handhelds-2.6/htcapache"
# 
# add_dir "packages/linux/linux-handhelds-2.6/htcsable"
# 
# add_file "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
#  content [7addd9dd4ac5d4edc0a0214f42a704e645017508]
# 
# add_file "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
#  content [8859f0978e3ec80e423cf6fa402235335902f60a]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5f9d6cf541be67c463ff4f89b5de124a851e5dc5]
#    to [492fb6241aa69eb82747c0c5b369480a2ed86c6f]
# 
============================================================
--- packages/linux/linux-handhelds-2.6/htcapache/defconfig	7addd9dd4ac5d4edc0a0214f42a704e645017508
+++ packages/linux/linux-handhelds-2.6/htcapache/defconfig	7addd9dd4ac5d4edc0a0214f42a704e645017508
@@ -0,0 +1,1362 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21-hh10
+# Fri Jul  6 13:14:59 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=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_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_UID16 is not set
+CONFIG_SYSCTL_SYSCALL=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=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# 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_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX 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_NS9XXX 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
+CONFIG_BOARD_IRQ_MAP_SMALL=y
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_TOSHIBA_TMIO_OHCI is not set
+# CONFIG_ARCH_ESERIES is not set
+# CONFIG_MACH_A620 is not set
+# CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
+# CONFIG_ARCH_H1900 is not set
+# CONFIG_ARCH_H2200 is not set
+# CONFIG_MACH_H3900 is not set
+# CONFIG_MACH_H4000 is not set
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_HX2750 is not set
+# CONFIG_ARCH_H5400 is not set
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+CONFIG_MACH_HTCAPACHE=y
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
+# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
+# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_X50 is not set
+# CONFIG_ARCH_ROVERP1 is not set
+# CONFIG_ARCH_ROVERP5P is not set
+# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_T3XSCALE is not set
+# CONFIG_MACH_RECON is not set
+# CONFIG_MACH_GHI270HG is not set
+# CONFIG_MACH_GHI270 is not set
+# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
+CONFIG_PXA27x=y
+CONFIG_PXA_SSP=y
+CONFIG_PXA27x_VOLTAGE=y
+CONFIG_PXA27x_VOLTAGE_MAX158xx=y
+
+#
+# Linux As Bootloader
+#
+# CONFIG_LAB is not set
+
+#
+# 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
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+CONFIG_IWMMXT=y
+CONFIG_XSCALE_PMU=y
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+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_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="keepinitrd"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+# CONFIG_TXTOFFSET_DELTA is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_PXA=y
+CONFIG_PXA25x_ALTERNATE_FREQS=y
+
+#
+# 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 is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_DPM_DEBUG=y
+CONFIG_PM_SYSFS_DEPRECATED=y
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE 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 is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# 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=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES 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=y
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=y
+# CONFIG_IRNET is not set
+CONFIG_IRCOMM=y
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=y
+
+#
+# Dongle support
+#
+# CONFIG_DONGLE is not set
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+CONFIG_PXA_FICP=y
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IEEE80211 is not set
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES 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=y
+CONFIG_MTD_DEBUG_VERBOSE=0
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS 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 is not set
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+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=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# 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
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS 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=m
+CONFIG_MTDRAM_TOTAL_SIZE=0
+CONFIG_MTDRAM_ERASE_SIZE=256
+# 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
+#
+# CONFIG_PNPACPI is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA 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
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_HOSTAP is not set
+CONFIG_ACX=m
+CONFIG_ACX_MEM=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# 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
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_LED_TRIGGER is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# 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_KEYBOARD_STOWAWAY is not set
+CONFIG_GPIODEV_KEYS=y
+# CONFIG_GPIODEV_DIAGONAL is not set
+CONFIG_KEYBOARD_PXA27x=y
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_NAVPOINT is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+CONFIG_TOUCHSCREEN_ADC=y
+# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
+# CONFIG_TOUCHSCR%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rf3bfa89a401bbe5f20aab265a69e2f5579a7cc15 -r7e6adf2eba691057299d67aeff9562e39132c566
#
# 
# 
# delete "packages/perl/perl-5.8.8/native-makedepend-dash.patch"
# 
# add_dir "packages/gtkhtml/gtkhtml-3.6"
# 
# add_file "packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch"
#  content [24ca1839c8f9660e8791e4a91370e3e6f805a70f]
# 
# add_file "packages/libtool/libtool-1.5.10/rpath-control.patch"
#  content [4b31b6687ccede8fff1b635bac99942b42df9243]
# 
# add_file "packages/perl/perl-5.8.8/asm-pageh-fix.patch"
#  content [88de907a5838bef4de53f3c7515dad79964e02c0]
# 
# add_file "packages/perl/perl-5.8.8/makedepend-dash.patch"
#  content [a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27]
# 
# patch "contrib/feed-browser/includes/functions.inc"
#  from [f33374987037202cd21d7f82a93b7da3f0c573a9]
#    to [041208fd72802891209d607c7a4f1777a946ed1d]
# 
# patch "contrib/feed-browser/index.php"
#  from [0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf]
#    to [b7a98a4213e06372bea54a7e27ea29b13d1e615a]
# 
# patch "contrib/feed-browser/update.php"
#  from [0a6696349338576e60018f0f8fbbf645cec91913]
#    to [9b418cf2e8cefddae617ffd8e121293445ea1ee1]
# 
# patch "packages/gaim/pidgin.inc"
#  from [e29a09b918f8e325f24898d1a61c57d3a11e50e7]
#    to [f2b101bebf0f41aa0943a55e76c86c0933428cbc]
# 
# patch "packages/gaim/pidgin_2.0.2.bb"
#  from [f38dd9af51ab37706164482bcece1477daca655a]
#    to [a9a41db903f3d596482445b8db09f363c20c02fd]
# 
# patch "packages/gtkhtml/gtkhtml-3.6_3.6.2.bb"
#  from [8e6b36356e74e2e1e8b0ca6bb493a488f4df5610]
#    to [635c93b9d318b910d01d772af59963371fdab2cd]
# 
# patch "packages/libtool/libtool-cross_1.5.10.bb"
#  from [3b24a14b6df3c0d9f7064a5bab60102a3ebe1b57]
#    to [1d9d18b4a0241cde485f05db92de7f18738d2507]
# 
# patch "packages/libtool/libtool-native_1.5.10.bb"
#  from [bc799a0464069f3531cbb0a017c4d8d2a1afd63e]
#    to [3db44cdc921e61d2528664266cd0eda2cbf4d430]
# 
# patch "packages/perl/perl-native_5.8.8.bb"
#  from [2f2d7163b1fd47aa9554cf3e954cd81ea1e73556]
#    to [2cae048240cb214c212fca8f25326366a6306e02]
# 
# patch "packages/perl/perl_5.8.8.bb"
#  from [f198d25a435c2c098c223920580b19b2aca03755]
#    to [c97084e319193690d0222303aa7f475971c1dff9]
# 
# patch "packages/qemu/qemu-native.inc"
#  from [71d3322a1e1cff08495c023c071fdd6a29e15a80]
#    to [740a86de6db274cb5c05df97968b02f1bc33a4cf]
# 
# patch "packages/qt/qt4_arch.inc"
#  from [8912a21d98b8e45e7143daad589738537496a81a]
#    to [43091f9af06d057e17db4730361caf8d5fc177c6]
# 
============================================================
--- packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch	24ca1839c8f9660e8791e4a91370e3e6f805a70f
+++ packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch	24ca1839c8f9660e8791e4a91370e3e6f805a70f
@@ -0,0 +1,25 @@
+diff --git a/components/html-editor/Makefile.am b/components/html-editor/Makefile.am
+index 7fda5ae..925e409 100644
+--- a/components/html-editor/Makefile.am
++++ b/components/html-editor/Makefile.am
+@@ -5,7 +5,7 @@ gtkhtml_data = $(datadir)/gtkhtml- at GTKHTML_API_VERSION@
+ gladedir = $(gtkhtml_data)
+ glade_DATA = gtkhtml-editor-properties.glade
+ 
+-INCLUDES = -I$(top_srcdir)/src -I$(srcdir) -I$(includedir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
++INCLUDES = -I$(top_srcdir)/src -I$(srcdir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
+ 	-DG_LOG_DOMAIN=\"gtkhtml\" \
+ 	-DSRCDIR=\"$(srcdir)\" \
+ 	-DPREFIX=\"$(prefix)\"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f76178f..2d70183 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,6 @@ NULL=
+ INCLUDES = 				\
+ 	-I$(top_srcdir)			\
+ 	-I$(srcdir)			\
+-	-I$(includedir)			\
+ 	$(GTKHTML_CFLAGS)		\
+ 	$(SOUP_CFLAGS)			\
+ 	-DG_LOG_DOMAIN=\"gtkhtml\"	\
============================================================
--- packages/libtool/libtool-1.5.10/rpath-control.patch	4b31b6687ccede8fff1b635bac99942b42df9243
+++ packages/libtool/libtool-1.5.10/rpath-control.patch	4b31b6687ccede8fff1b635bac99942b42df9243
@@ -0,0 +1,21 @@
+diff --git a/ltmain.in b/ltmain.in
+--- a/ltmain.in
++++ b/ltmain.in
+@@ -3688,6 +3705,7 @@ EOF
+ 	  rpath="$finalize_rpath"
+ 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
++	   if test "$OE_LT_RPATH_ALLOW" = "any" -o "${OE_LT_RPATH_ALLOW/:${libdir}:/}" != "$OE_LT_RPATH_ALLOW" ; then
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+ 		if test -z "$hardcode_libdirs"; then
+@@ -3712,6 +3730,9 @@ EOF
+ 	      *) perm_rpath="$perm_rpath $libdir" ;;
+ 	      esac
+ 	    fi
++	   else
++	    echo "OE: Not hardcoding '$libdir' into rpath"
++	   fi
+ 	  done
+ 	  # Substitute the hardcoded libdirs into the rpath.
+ 	  if test -n "$hardcode_libdir_separator" &&
============================================================
--- packages/perl/perl-5.8.8/asm-pageh-fix.patch	88de907a5838bef4de53f3c7515dad79964e02c0
+++ packages/perl/perl-5.8.8/asm-pageh-fix.patch	88de907a5838bef4de53f3c7515dad79964e02c0
@@ -0,0 +1,19 @@
+Perl inclues asm/page.h in order to get the definition for getpagesize which
+has been definied in unistd.h since glibc 2.1. Some recent version of linux
+libc headers removed the asm/page.h resulting in failures here for some
+people.
+
+Index: perl-5.8.8/ext/IPC/SysV/SysV.xs
+===================================================================
+--- perl-5.8.8.orig/ext/IPC/SysV/SysV.xs	2001-07-01 04:46:07.000000000 +1000
++++ perl-5.8.8/ext/IPC/SysV/SysV.xs	2007-07-06 11:40:21.000000000 +1000
+@@ -3,9 +3,6 @@
+ #include "XSUB.h"
+ 
+ #include <sys/types.h>
+-#ifdef __linux__
+-#   include <asm/page.h>
+-#endif
+ #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+ #ifndef HAS_SEM
+ #   include <sys/ipc.h>
============================================================
--- packages/perl/perl-5.8.8/makedepend-dash.patch	a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27
+++ packages/perl/perl-5.8.8/makedepend-dash.patch	a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27
@@ -0,0 +1,13 @@
+Index: perl-5.8.8/makedepend.SH
+===================================================================
+--- perl-5.8.8.orig/makedepend.SH	2007-05-24 12:06:52.000000000 +1000
++++ perl-5.8.8/makedepend.SH	2007-05-24 12:27:33.000000000 +1000
+@@ -128,7 +128,7 @@
+     *.y) filebase=`basename $file .y` ;;
+     esac
+     case "$file" in
+-    */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
++    */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;;
+     *)   finc= ;;
+     esac
+     $echo "Finding dependencies for $filebase$_o."
============================================================
--- contrib/feed-browser/includes/functions.inc	f33374987037202cd21d7f82a93b7da3f0c573a9
+++ contrib/feed-browser/includes/functions.inc	041208fd72802891209d607c7a4f1777a946ed1d
@@ -1,7 +1,7 @@
 <?php
 /*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
  *
  * This program is free software; you can redistribute it and/or  modify it under
  * the terms of the GNU General Public License as published by the Free
@@ -112,19 +112,28 @@ function searchletter($searchletter = ''
 		}
 		else
 		{
-			$ipkgoutput .= sprintf(" <a href='?action=letter&amp;g=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
+			$ipkgoutput .= sprintf(" <a href='?letter=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
 		}
 	}
 
-	$ipkgoutput .= " <a href='?action=letter&amp;g=z' title='packages which names begins with \"z\"'>z</a></div>";
+	$ipkgoutput .= " <a href='?letter=z' title='packages which names begins with \"z\"'>z</a></div>";
 
 	return $ipkgoutput;
 }
 
-function searchpkg ($searchword)
+function searchpkg ($searchword, $searcharch = '')
 {
-	if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section  FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC"))
+	$query = "SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ";
+	
+	if(!empty($searcharch))
 	{
+		$query .= " AND p_arch='{$searcharch}' ";
+	}
+
+	$query .= 'ORDER BY p_name ASC';
+	
+	if($result = db_query($query))
+	{
 	    return generate_list_of_packages($result);
 	}
 }
@@ -149,7 +158,7 @@ function generate_list_of_packages($quer
 			}
 
 			$ipkgoutput .= sprintf
-				("<tr><td><a href='?action=details&amp;pnm=%s'>%s</a></td><td><a href=\"?action=section&amp;section=%s\">%s</a></td><td> %s</td></tr>\n",
+				("<tr><td><a href='?pkgname=%s'>%s</a></td><td><a href=\"?section=%s\">%s</a></td><td> %s</td></tr>\n",
 				urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], htmlentities($package['p_desc']));
 		}
 
@@ -173,7 +182,7 @@ function pkgdetails ($package)
 	$result = db_query("SELECT * FROM packages,feeds
 				WHERE (packages.p_name='$package' OR packages.p_provides='$package')
 				    AND feeds.f_id = packages.p_feed 
-				ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC ");
+				ORDER BY packages.p_version DESC, packages.p_arch ASC ");
 	
 	// display first result
 
@@ -194,7 +203,7 @@ function pkgdetails ($package)
 
 		if($package['packages.p_section'])
 		{
-			$details .= sprintf ("\n<dt>Section:</dt><dd><a href='?action=section&amp;section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
+			$details .= sprintf ("\n<dt>Section:</dt><dd><a href='?section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
 		}
 		
 		if($package['packages.p_depends'])
@@ -310,7 +319,7 @@ function addlinks ($input)
 		{
 			// find position of string in line
 			$pos = strpos ($input, $element, $offset);
-			$link = sprintf("<a href=\"?action=details&amp;pnm=%s\">$element</a>", urlencode ($element));
+			$link = sprintf("<a href=\"?pkgname=%s\">$element</a>", urlencode ($element));
 
 			// replace element with a link
 			$input = substr_replace ($input, $link, $pos, strlen ($element));
@@ -361,7 +370,7 @@ function sectionslist()
 
 		foreach($sections as $section_name1=>$item)
 		{
-			$output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a>",
+			$output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
 				urlencode($section_name1),
 				urlencode($section_name1),
 				$section_name1);
@@ -373,7 +382,7 @@ function sectionslist()
 				foreach($item as $section_name2=>$subitem)
 				{
 					$section_name = "{$section_name1}/{$section_name2}";
-					$output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a>",
+					$output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
 						urlencode($section_name),
 						urlencode($section_name),
 						$section_name2);
@@ -385,7 +394,7 @@ function sectionslist()
 						foreach($subitem as $section_name3=>$subitem2)
 						{
 							$section_name = "{$section_name1}/{$section_name2}/{$section_name3}";
-							$output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a></li>",
+							$output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a></li>",
 								urlencode($section_name),
 								urlencode($section_name),
 								$section_name3);
@@ -411,8 +420,12 @@ function check_database()
 
 function check_database()
 {
-	if($db = sqlite_open(DB_FILENAME))
+	$db_exists = FALSE;
+
+	if(file_exists(DB_FILENAME) AND $db = sqlite_open(DB_FILENAME))
 	{
+		$db_exists = TRUE;
+
 		//initialize db
 		if (db_table_exists ($db, 'packages') === FALSE)
 		{  
@@ -443,15 +456,32 @@ function check_database()
 				f_name       varchar(32),
 				f_uri        varchar(100),
 				f_type		 varchar(16)
-		)");
+				f_comments   varchar(500))");
 
 			insert_feeds ($db) ;
 		}
 
 		sqlite_close($db);
 	}
+
+	return $db_exists;
 }
 
+function read_vars_from_get($array_of_vars)
+{
+    foreach($array_of_vars as $name_of_var)
+    {
+	$GLOBALS[$name_of_var] = '';
 
+	if(isset($_GET[$name_of_var]))
+	{
+	    $GLOBALS[$name_of_var] = $_GET[$name_of_var];
+	}
+    }
+}
 
+function get_arch_list()
+{
+    return db_query('SELECT DISTINCT p_arch FROM packages WHERE p_arch NOT IN (NULL, "", "all") ORDER BY p_arch ASC');
+}
 ?>
============================================================
--- contrib/feed-browser/index.php	0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf
+++ contrib/feed-browser/index.php	b7a98a4213e06372bea54a7e27ea29b13d1e615a
@@ -1,8 +1,8 @@
 <?php
 
 /*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
  *
  * This php script is intended to do the following:
  *
@@ -33,46 +33,34 @@ require_once 'includes/functions.inc';
 require_once 'includes/config.inc';
 require_once 'includes/functions.inc';
 
-check_database();
+if(!check_database())
+{
+	die("Database not found and cannot be created.");
+}
 
-$name = '';
+read_vars_from_get(array('name', 'arch', 'pkgsearch', 'letter', 'pkgname', 'section'));
 
-if(isset($_GET['name']))
+$ipkgoutput = '';
+
+if(!empty($section))
 {
-	$name = $_GET['name'];
+	$ipkgoutput = searchsection($section);
 }
-
-$action = '';
-
-if(isset($_GET['action']))
+elseif(!empty($letter))
 {
-	$action = $_GET['action'];
+	$ipkgoutput = searchpkg("{$letter}%", $arch);
 }
-
-switch($action)
+elseif(!empty($pkgname))
 {
-	case "details":
-		$ipkgoutput = pkgdetails ($_GET['pnm']);
-		break;
+	$ipkgoutput = pkgdetails($pkgname);
+}
+elseif(!empty($pkgsearch) OR !empty($arch))
+{
+	$ipkgoutput = searchpkg("%{$pkgsearch}%", $arch);
+}
 
-	case "search":
-		$ipkgoutput = searchpkg ("%{$name}%");
-		break;
+$archs_list = get_arch_list();
 
-	case "section":
-		$ipkgoutput = searchsection($_GET['section']);
-		break;
-
-	case "letter":
-		$letter = $_GET['g'];
-		$ipkgoutput = searchpkg ("{$letter}%");
-		break;
-
-	default:
-		$ipkgoutput = searchpkg("a");
-		break;
-}
-
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
@@ -88,8 +76,25 @@ switch($action)
 			<form action="" method="get">
 				<fieldset>
 					<label for="name">Package name</label>
-					<input type="text" name="name" value="<?php echo $name; ?>" />
-					<input type="hidden" name="action" value="search" />
+					<input type="text" name="pkgsearch" value="<?php echo $pkgsearch; ?>" />
+					<select name="arch">
+					   <option value="" selected="selected">all architectures</option>
+					   <option value="all">no arch</option>
+<?php
+
+foreach($archs_list as $architecture)
+{
+    echo "<option value='{$architecture['p_arch']}'";
+
+    if($architecture['p_arch'] == $arch)
+    {
+	echo ' selected="selected"';
+    }
+    echo ">{$architecture['p_arch']}</option>";
+}
+
+?>
+					</select>
 					<input type="submit" value="Search" />
 				</fieldset>
 			</form>
============================================================
--- contrib/feed-browser/update.php	0a6696349338576e60018f0f8fbbf645cec91913
+++ contrib/feed-browser/update.php	9b418cf2e8cefddae617ffd8e121293445ea1ee1
@@ -1,5 +1,7 @@
 <?php
-/* (c) Koen Kooi 2006
+/* 
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
  *
  * This program is free software; you can redistribute it and/or  modify it under
  * the terms of the GNU General Public License as published by the Free
@@ -37,7 +39,10 @@ require_once 'includes/functions.inc';
    Description: IPv4 link-local address allocator
  */
 
-check_database();
+if(!check_database())
+{
+	die("Database not found and cannot be created.");
+}
 
 $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
 
============================================================
--- packages/gaim/pidgin.inc	e29a09b918f8e325f24898d1a61c57d3a11e50e7
+++ packages/gaim/pidgin.inc	f2b101bebf0f41aa0943a55e76c86c0933428cbc
@@ -19,6 +19,9 @@ EXTRA_OECONF = " \
 		--with-gnutls-libs=${STAGING_LIBDIR} \
 		"
 
+OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
+OE_LT_RPATH_ALLOW[export]="1"
+
 PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg"
 
 
============================================================
--- packages/gaim/pidgin_2.0.2.bb	f38dd9af51ab37706164482bcece1477daca655a
+++ packages/gaim/pidgin_2.0.2.bb	a9a41db903f3d596482445b8db09f363c20c02fd
@@ -6,4 +6,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/
 	   file://pidgin.desktop-set-icon.patch;patch=1 \
 	  " 
 
+PR = "r1"
-PR = "r0"
=============%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list