[oe-commits] org.oe.dev merge of '72649b856ad1fa4e391eeee4bff017f81ce286e5'

pfalcon commit openembedded-commits at lists.openembedded.org
Thu Feb 14 07:37:56 UTC 2008


merge of '72649b856ad1fa4e391eeee4bff017f81ce286e5'
     and 'f2dfdf36b662ada68981f5b1bbb624236058c13f'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: bc0b144ff867cb1e66b24d5ba91c183ee6d51cb6
ViewMTN: http://monotone.openembedded.org/revision/info/bc0b144ff867cb1e66b24d5ba91c183ee6d51cb6
Files:
1
packages/images/x11-gpe-java-image.bb
packages/tasks/task-java.bb
packages/linux/linux-2.6.22/bd-neon/defconfig
packages/linux/linux_2.6.22.bb
packages/logic-analyzer/logic-analyzer_0.8.bb
packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch
packages/u-boot/u-boot_1.1.2.bb
packages/gnome/gconf-dbus/gconf-dbus-update.patch
packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
packages/gnome/gconf-dbus_cvs.bb
packages/opie-irc/files
packages/opie-irc/files/utf8-topic.patch
packages/opie-irc/files/utf8.patch
packages/tslib/tslib/ts.conf
packages/udev/udev-115/noasmlinkage.patch
packages/klibc/files/fstype-sane-and-vfat.patch
packages/klibc/files/fstype-sane-and-vfat-jffs2.patch
packages/tslib/tslib-1.0/bd-neon
packages/tslib/tslib/bd-neon
packages/tslib/tslib-1.0/fic-gta01
packages/tslib/tslib/fic-gta01
packages/tslib/tslib-1.0/ts.conf
packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch
packages/tslib/tslib/tslib-input_raw-grab_events.patch
packages/udev/udev-115
packages/udev/udev-118
packages/udev/udev_115.bb
packages/udev/udev_118.bb
packages/busybox/busybox-1.9.1
packages/gstreamer/gst-plugin-pulse
packages/busybox/busybox_1.9.1.bb
packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/sharprom-compatible.conf
packages/busybox/busybox-1.7.2/defconfig
packages/busybox/busybox_1.7.2.bb
packages/gnome/gconf-dbus_svn.bb
packages/gstreamer/gst-plugin-pulse_0.9.7.bb
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/klibc/klibc-utils-fstype_1.1.1.bb
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/opie-irc/opie-irc_1.2.3.bb
packages/opie-irc/opie-irc_cvs.bb
packages/python/python_2.5.1.bb
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
Diffs:

#
# mt diff -r72649b856ad1fa4e391eeee4bff017f81ce286e5 -rbc0b144ff867cb1e66b24d5ba91c183ee6d51cb6
#
# 
# 
# add_file "packages/images/x11-gpe-java-image.bb"
#  content [3b45ba2ebb901a469fad2c1a1d1fbe0cd62877e5]
# 
# add_file "packages/tasks/task-java.bb"
#  content [297623fd9c1f9cc6c4c53842cdc2d5060ac4eeb1]
# 
# patch "packages/linux/linux-2.6.22/bd-neon/defconfig"
#  from [51ac8c6702a287c8d89868c676af977d0e22b6a8]
#    to [85fd7ff04ade351f2b978e1aabc701ce6ca7ede6]
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [d2956319f8e397f13ec591b680e387dd8d9b6761]
#    to [aac5c473083091c9913aa0f23770731512906188]
# 
# patch "packages/logic-analyzer/logic-analyzer_0.8.bb"
#  from [887bea96f05438c0a3baacddfbfcf142ec2638c8]
#    to [1e3e07bd6310e527a51b823ad86b2c244344f083]
# 
# patch "packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch"
#  from [5bdc13848fb9c2d6730679aa4337a3e05d20ab64]
#    to [dd071708735bcbf55e0047cbc9a3e89f4da72359]
# 
# patch "packages/u-boot/u-boot_1.1.2.bb"
#  from [1665c20c3e71e8c616a87744bdb4af3b2d8a45fb]
#    to [3e59753d7bc615f69a67bd869ee5820479e942bf]
# 
============================================================
--- packages/images/x11-gpe-java-image.bb	3b45ba2ebb901a469fad2c1a1d1fbe0cd62877e5
+++ packages/images/x11-gpe-java-image.bb	3b45ba2ebb901a469fad2c1a1d1fbe0cd62877e5
@@ -0,0 +1,27 @@
+#Angstrom X11 image, with apps and kernel modules included
+
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-gpe-java-image"
+
+DEPENDS = "task-base"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-base-extended \
+    task-java \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    kernel-modules \
+    hal \
+    angstrom-gpe-task-pim \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- packages/tasks/task-java.bb	297623fd9c1f9cc6c4c53842cdc2d5060ac4eeb1
+++ packages/tasks/task-java.bb	297623fd9c1f9cc6c4c53842cdc2d5060ac4eeb1
@@ -0,0 +1,13 @@
+DESCRIPTION = "Base task package for Java"
+PR = "r1"
+LICENSE = "MIT"
+
+inherit task
+
+RDEPENDS_${PN} = "\
+    cacao \
+    classpath-awt \
+    java2-runtime \
+    librxtx-java \
+    logic-analyzer \
+ "
============================================================
--- packages/linux/linux-2.6.22/bd-neon/defconfig	51ac8c6702a287c8d89868c676af977d0e22b6a8
+++ packages/linux/linux-2.6.22/bd-neon/defconfig	85fd7ff04ade351f2b978e1aabc701ce6ca7ede6
@@ -1,18 +1,27 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19.2
-# Thu May 24 16:14:49 2007
+# Linux kernel version: 2.6.22
+# Tue Feb 12 16:12:07 2008
 #
 CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+# CONFIG_GENERIC_CLOCKEVENTS is not set
 CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=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"
@@ -36,9 +45,11 @@ CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+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
@@ -54,14 +65,19 @@ CONFIG_FUTEX=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -77,7 +93,9 @@ CONFIG_BLOCK=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
@@ -109,12 +127,15 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 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
@@ -122,6 +143,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
 
 #
@@ -132,6 +154,7 @@ CONFIG_MACH_NEON=y
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_MACH_ARGON is not set
 CONFIG_MACH_NEON=y
+# CONFIG_MACH_NEON270 is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_PXA_SHARPSL is not set
 # CONFIG_MACH_TRIZEPS4 is not set
@@ -154,11 +177,14 @@ CONFIG_CPU_CP15_MMU=y
 #
 # CONFIG_ARM_THUMB is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+# CONFIG_IWMMXT is not set
 CONFIG_XSCALE_PMU=y
 
 #
 # Bus support
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -168,6 +194,7 @@ CONFIG_XSCALE_PMU=y
 #
 # Kernel Features
 #
+# CONFIG_TICK_ONESHOT is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
@@ -183,6 +210,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
 # 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
 
 #
@@ -190,8 +218,9 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE=" debug "
 # CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
 
 #
 # Floating point emulation
@@ -210,13 +239,11 @@ CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
 #
 # CONFIG_PM is not set
-# CONFIG_APM is not set
 
 #
 # Networking
@@ -226,13 +253,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -259,25 +286,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG 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 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
@@ -303,6 +319,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
 CONFIG_IEEE80211=y
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=y
@@ -310,7 +334,7 @@ CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 CONFIG_IEEE80211_CRYPT_TKIP=y
 CONFIG_IEEE80211_SOFTMAC=y
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
-CONFIG_WIRELESS_EXT=y
+# CONFIG_RFKILL is not set
 
 #
 # Device Drivers
@@ -323,6 +347,7 @@ CONFIG_FW_LOADER=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 
 #
@@ -330,10 +355,6 @@ CONFIG_CONNECTOR=y
 #
 CONFIG_CONNECTOR=y
 # CONFIG_PROC_EVENTS is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -346,6 +367,7 @@ CONFIG_MTD_CHAR=y
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 # CONFIG_MTD_BLOCK is not set
 CONFIG_MTD_BLOCK_RO=y
 # CONFIG_FTL is not set
@@ -378,7 +400,6 @@ 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
 
 #
@@ -407,16 +428,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
 # 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
+# CONFIG_MTD_ONENAND is not set
 
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 
 #
 # Parallel port support
@@ -426,6 +444,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 
 #
 # Block devices
@@ -439,13 +458,8 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-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 is not set
 
 #
@@ -453,6 +467,7 @@ CONFIG_SCSI=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -472,6 +487,8 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -487,10 +504,6 @@ CONFIG_BLK_DEV_SD=y
 #
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 
 #
@@ -499,19 +512,6 @@ CONFIG_BLK_DEV_SD=y
 # 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
@@ -519,10 +519,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 
 #
@@ -533,37 +529,24 @@ CONFIG_SMC91X=y
 CONFIG_SMC91X=y
 # CONFIG_DM9000 is not set
 # CONFIG_SMC911X is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
 
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Ethernet (10000 Mbit)
+# USB Network Adapters
 #
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_HOSTAP is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-
-#
-# Wan interfaces
-#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+CONFIG_USB_PEGASUS=y
+CONFIG_USB_RTL8150=y
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -582,6 +565,7 @@ CONFIG_INPUT=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -591,7 +575,9 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 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_TSDEV=y
+CONFIG_INPUT_TSDEV_SCREEN_X=800
+CONFIG_INPUT_TSDEV_SCREEN_Y=480
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
@@ -605,31 +591,37 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_GPIO is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET 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_UCB1400=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -671,10 +663,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 
@@ -691,25 +679,51 @@ CONFIG_HW_RANDOM=y
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
 
 #
-# Ftape, the floppy tape device driver
+# TPM devices
 #
-# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
 
 #
-# TPM devices
+# I2C Algorithms
 #
-# CONFIG_TCG_TPM is not set
+CONFIG_I2C_ALGOBIT=m
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
 
 #
-# I2C support
+# I2C Hardware Bus support
 #
-# CONFIG_I2C is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_PXA is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 
 #
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
 # SPI support
 #
 # CONFIG_SPI is not set
@@ -719,24 +733,63 @@ CONFIG_HW_RANDOM=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CON%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rf2dfdf36b662ada68981f5b1bbb624236058c13f -rbc0b144ff867cb1e66b24d5ba91c183ee6d51cb6
#
# 
# 
# delete "packages/gnome/gconf-dbus/gconf-dbus-update.patch"
# 
# delete "packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch"
# 
# delete "packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch"
# 
# delete "packages/gnome/gconf-dbus_cvs.bb"
# 
# delete "packages/opie-irc/files"
# 
# delete "packages/opie-irc/files/utf8-topic.patch"
# 
# delete "packages/opie-irc/files/utf8.patch"
# 
# delete "packages/tslib/tslib/ts.conf"
# 
# delete "packages/udev/udev-115/noasmlinkage.patch"
# 
# rename "packages/klibc/files/fstype-sane-and-vfat.patch"
#     to "packages/klibc/files/fstype-sane-and-vfat-jffs2.patch"
# 
# rename "packages/tslib/tslib-1.0/bd-neon"
#     to "packages/tslib/tslib/bd-neon"
# 
# rename "packages/tslib/tslib-1.0/fic-gta01"
#     to "packages/tslib/tslib/fic-gta01"
# 
# rename "packages/tslib/tslib-1.0/ts.conf"
#     to "packages/tslib/tslib/ts.conf"
# 
# rename "packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch"
#     to "packages/tslib/tslib/tslib-input_raw-grab_events.patch"
# 
# rename "packages/udev/udev-115"
#     to "packages/udev/udev-118"
# 
# rename "packages/udev/udev_115.bb"
#     to "packages/udev/udev_118.bb"
# 
# add_dir "packages/busybox/busybox-1.9.1"
# 
# add_dir "packages/gstreamer/gst-plugin-pulse"
# 
# add_file "packages/busybox/busybox_1.9.1.bb"
#  content [c8311698ef9ec25768ea49185d010c66448e5a0d]
# 
# add_file "packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch"
#  content [983f98f4a785983ba5ee43545808ddd20911b92a]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [f09fc00fcb956472364428627b653deb21fa27ae]
#    to [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [a20012ca4a3de383c6062b1c564166182a18c681]
#    to [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [fb163a1560e2e33896cf337a40acbf4fc419e625]
#    to [06c680c836e1f326a6ad003d8e7198e317e64709]
# 
# patch "conf/distro/sharprom-compatible.conf"
#  from [dddff62a6004aa3bd797558e337f219b7a2ec7af]
#    to [1917f33c694aff55fe7253f1a1dcb3dcb92edde8]
# 
# patch "packages/busybox/busybox-1.7.2/defconfig"
#  from [1b817a040175f1743b843c14af87276af8dcfdff]
#    to [302bb125b48c659e36990a60ce62686437da9ab4]
# 
# patch "packages/busybox/busybox_1.7.2.bb"
#  from [c8c69ef36216408dc67cc3ed0cee0e19674a311e]
#    to [61b05f11ad827e5fe65f8b8140b7933dd41d915b]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [17c69da4bd130d92af8af24b002ef34409149a33]
#    to [0ae937994dd634efb5800bcac5e79d9dcfb531b6]
# 
# patch "packages/gstreamer/gst-plugin-pulse_0.9.7.bb"
#  from [c5556734ddb08e6598f9977cfab0a4291ccd955b]
#    to [5554f865191f1f521ae855a40f67b2d8b13bc4ac]
# 
# patch "packages/initrdscripts/files/30-bootmenu.sh"
#  from [4b9e167d681b0021650afe5f3dadac184ba2a50b]
#    to [217e6fb3656133f0b3da59e7967d23f3bdf7a59a]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [d4ac079860c7ff288110f5543bbff07217a7c618]
#    to [394be03a399dd523d0e97625df53ae15512e0a5d]
# 
# patch "packages/klibc/files/fstype-sane-and-vfat-jffs2.patch"
#  from [d4a15a94ce1fcbe5660e3ae975c493c18920219b]
#    to [a7465419a965e47d9c9dbfbd6bb38deb2cc9ebb2]
# 
# patch "packages/klibc/klibc-utils-fstype_1.1.1.bb"
#  from [aee9890849d771d8cb3019aa6ec1ac6af845eea7]
#    to [6ff908d2ee00f7b3302e2a5d0e6088e09b423d88]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
#  from [f8e3a8db216aee6aca3ccc73509629eabfe4b7af]
#    to [90a93f46c5489e0ccfb819e76f3dbcaf1dd8c7fd]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
#  from [11e1b83cd36052b91b2a7fb0d2c83bea4d94ac60]
#    to [afd12a3af4f106f7aed0d17aa11d57ad1926ba67]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
#  from [dafb4310f38feb21519762495cd6aab1cbd450aa]
#    to [4e01e38b76d921efe1287fa89dedcf60f4be9c60]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
#  from [828cdf2285631389ea3f3be66db4d0f2be3fad16]
#    to [c1987ac5e14751d61e0d555c0e2e361362e72c7f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
#  from [60595eee63f81963ed4f58ed96707082b9a5a226]
#    to [dda584217bf23dc94bbc30cfacdbe56087d9fee1]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
#  from [008e963413f842d5b6ebdff5674209597dc5b0fc]
#    to [f92a949985835df6b375a1c419aea95096316c60]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
#  from [7c5aa3bf26025ae39441a8014c52d17d8fe5f75d]
#    to [da563aa584be8a2be72ee32964d85d16175fd562]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
#  from [817ece80142e95d6b77ee2e7fc9f4ca3456d87c3]
#    to [99b053b8acb4395312d738a99a6516c987d5d409]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
#  from [4311ca7f9215517f300060255b5f8f2e4c5b06ff]
#    to [86542c3cc857687a74246ff718370ee11a788d8d]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
#  from [881be5d663f4f599897be2db56d052b7d071e432]
#    to [2040c8752a6f755a6a20d9ff042c5912eb32bb0f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
#  from [348429aa40689c2db4038e669221a60b28d6a355]
#    to [32750cd6ada179a51ca03416acd45d51a32ea145]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
#  from [9928a3e38a5be9c3291ae2100ab72fa2fa7d1fbc]
#    to [85ae080bc9ddf4014b97cd550558c09bfd9ba085]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
#  from [291b18feb43e010485b57fa4af6c3bd366a959fa]
#    to [7372bed084e45ce719cdc23451424de4a9893ee0]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
#  from [6983192573323e3ce27a9c5a0403dbdda1bc7bc6]
#    to [3585f1fc62fc9915c0103ac0650f5bada27c2146]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
#  from [0b4da127c1a0aaa95f65ae63254bf4db15c64cd2]
#    to [02bef9c1024f8dbc325f9d13a4f1d05f4d02ef90]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
#  from [d2ac56e548d71b2a58c9d52bb2174505bc299774]
#    to [15c4be5203c9d6af61b980beca140c9c48ab1934]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
#  from [3979a757a6390b7878c8f110879c16053c99d77f]
#    to [cc5addab0c771671efb084b73ad6608304bac4d9]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
#  from [5badee1f88e843603429234790dff51d8d5e2fdc]
#    to [473005b7a9ca078839e7f3c06e1d0dbe7b5ce651]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
#  from [61d25537df7d34eb32c61f62053e455790109b4e]
#    to [ed1fef91e7b0071878107a770c28b2d9157564da]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
#  from [10b01ced26df5bdd5fed1fffedbef1f3e7cb8dba]
#    to [35f12816e4e84ebff59a17593f63de3cca783b9e]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
#  from [e405b46c56ca807e9736efbf8e745c5be2974f32]
#    to [0c13f7fa7358c4fd3b369ac0d6398842b4a2f1f5]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
#  from [3d07b1bc59ea440df124fada8ef0b959a8c30a8e]
#    to [eb78f0beed41b147084e0b6ab6173d5af624b25f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
#  from [1a4579f3546b0699ab09315892303e48f538990e]
#    to [0037f3ae4cf65609124f84757a2b6b6398b12261]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
#  from [180611e63474da710360bf52fc7bfac32bafcb34]
#    to [013956ef6b10d21772c7e6c1567c4c7771e7fc30]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [ab9f51a943d6aa29ec5636df8430e32283831244]
#    to [9b192edda6738e475e2ce3b34c431197f7390c51]
# 
# patch "packages/opie-irc/opie-irc_1.2.3.bb"
#  from [7c1584e98f129223f4252c85d691413f5ade1ec5]
#    to [c4b837cfd973ef9166c1d40ef456df935a8807a3]
# 
# patch "packages/opie-irc/opie-irc_cvs.bb"
#  from [cee4fec93573b3ece698d3fd00fb8ebb408da7e8]
#    to [a9a04d935da27288823d2c6ff1bc605bb7ec11ed]
# 
# patch "packages/python/python_2.5.1.bb"
#  from [6d27b00bf376c2bb92ca2334ea83cc13b1d06aa0]
#    to [06d728d5c77de9872867236d0f3de020ed8b79f1]
# 
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
#  from [6926e921975f4064b4bf5b6e4030f8afc98652cb]
#    to [13c0bde7a606ffbf475967b7990ea82a22247655]
# 
# patch "packages/udev/udev_118.bb"
#  from [7291914002cb179304f1fa3a8206dbf86247b426]
#    to [ea5479f679eae83985b0d677a1317948a47e3ac4]
# 
============================================================
--- packages/busybox/busybox_1.9.1.bb	c8311698ef9ec25768ea49185d010c66448e5a0d
+++ packages/busybox/busybox_1.9.1.bb	c8311698ef9ec25768ea49185d010c66448e5a0d
@@ -0,0 +1,112 @@
+require busybox.inc
+PR = "r0"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+           file://busybox-cron \
+           file://busybox-httpd \
+           file://busybox-udhcpd \
+           file://default.script \
+           file://hwclock.sh \
+           file://mount.busybox \
+           file://syslog \
+           file://syslog.conf \
+           file://udhcpscript.patch;patch=1 \
+           file://umount.busybox \
+           file://run_parts.c \
+           file://defconfig"
+
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
+
+do_configure () {
+	cp ${WORKDIR}/run_parts.c ${S}/debianutils/
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	cml1_do_configure
+}
+
+do_compile () {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	base_do_compile
+}
+
+do_install () {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	install -d ${D}${sysconfdir}/init.d
+	oe_runmake "PREFIX=${D}" install
+	cp -pPR ${S}/_install/* ${D}/
+
+	# Move everything to /busybox (not supposed to end up in any package)
+	install -d ${D}/busybox
+	ls ${D} -R
+
+	cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+	# Move the busybox binary back to /bin
+	install -d ${D}${base_bindir}
+	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+	# Move back the sh symlink
+	test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+
+	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+		# Move crond back to /usr/sbin/crond
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+		# Move httpd back to /usr/sbin/httpd
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+		install -d ${D}/srv/www
+	fi
+	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+		# Move udhcpd back to /usr/sbin/udhcpd
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+		# Move hwclock back to /sbin/hwclock
+		install -d ${D}${base_sbindir}
+		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+		# Move dhcpc back to /usr/sbin/udhcpc
+		install -d ${D}${base_sbindir}
+		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+		install -d ${D}${sysconfdir}/udhcpc.d
+		install -d ${D}${datadir}/udhcpc
+		install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+	fi
+
+	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
+pkg_prerm_${PN} () {
+	# This is so you can make busybox commit suicide - removing busybox with no other packages
+	# providing its files, this will make update-alternatives work, but the update-rc.d part
+	# for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+	tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+	ln -s /bin/busybox $tmpdir/[
+	ln -s /bin/busybox $tmpdir/test
+	ln -s /bin/busybox $tmpdir/head
+	ln -s /bin/busybox $tmpdir/sh
+	ln -s /bin/busybox $tmpdir/basename
+	ln -s /bin/busybox $tmpdir/echo
+	ln -s /bin/busybox $tmpdir/mv
+	ln -s /bin/busybox $tmpdir/ln
+	ln -s /bin/busybox $tmpdir/dirname
+	ln -s /bin/busybox $tmpdir/rm
+	ln -s /bin/busybox $tmpdir/sed
+	ln -s /bin/busybox $tmpdir/sort
+	export PATH=$PATH:$tmpdir
+	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links
+}
============================================================
--- packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch	983f98f4a785983ba5ee43545808ddd20911b92a
+++ packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch	983f98f4a785983ba5ee43545808ddd20911b92a
@@ -0,0 +1,13 @@
+Index: gst-pulse-0.9.7/src/pulsesink.c
+===================================================================
+--- gst-pulse-0.9.7.orig/src/pulsesink.c
++++ gst-pulse-0.9.7/src/pulsesink.c
+@@ -477,6 +477,8 @@ static guint gst_pulsesink_write(GstAudi
+         length -= l;
+ 
+         sum += l;
++
++	usleep( 500 );
+     }
+ 
+     pa_threaded_mainloop_unlock(pulsesink->mainloop);
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	f09fc00fcb956472364428627b653deb21fa27ae
+++ conf/distro/include/preferred-om-2008-versions.inc	ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
@@ -1 +1,8 @@
+PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"
+
============================================================
--- conf/distro/include/sane-srcdates.inc	a20012ca4a3de383c6062b1c564166182a18c681
+++ conf/distro/include/sane-srcdates.inc	458c1cdc7fdad7be3787a02fe3c5ab93a2b03733
@@ -46,7 +46,6 @@ SRCDATE_gpesyncd ?= "20070701"
 SRCDATE_gpesyncd ?= "20070701"
 
 # GNOME
-SRCDATE_gconf-dbus ?= "20070512"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
============================================================
--- conf/distro/include/sane-srcrevs.inc	fb163a1560e2e33896cf337a40acbf4fc419e625
+++ conf/distro/include/sane-srcrevs.inc	06c680c836e1f326a6ad003d8e7198e317e64709
@@ -23,7 +23,7 @@ SRCREV_pn-fstests ?= "204"
 SRCREV_pn-epiphany ?= "7650"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
-SRCREV_pn-gconf-dbus ?= "606"
+SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gsm0710muxd ?= "73"
============================================================
--- conf/distro/sharprom-compatible.conf	dddff62a6004aa3bd797558e337f219b7a2ec7af
+++ conf/distro/sharprom-compatible.conf	1917f33c694aff55fe7253f1a1dcb3dcb92edde8
@@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc
 PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 
 PREFERRED_VERSION_glibc = "2.2.5"
============================================================
--- packages/busybox/busybox-1.7.2/defconfig	1b817a040175f1743b843c14af87276af8dcfdff
+++ packages/busybox/busybox-1.7.2/defconfig	302bb125b48c659e36990a60ce62686437da9ab4
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.7.2
-# Mon Feb  4 10:11:39 2008
+# Wed Feb 13 13:31:37 2008
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -73,7 +73,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list