[oe-commits] org.oe.dev merge of '045e56420da1d629481fa1a4c311ddb81cfd68d8'

crofton commit openembedded-commits at lists.openembedded.org
Thu Aug 23 14:10:44 UTC 2007


merge of '045e56420da1d629481fa1a4c311ddb81cfd68d8'
     and 'b7def8e05c706107b7e68312f5e8ca17c4bdda6b'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 215bca295ed86f179e1bb5082f01a1186b910b0d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=215bca295ed86f179e1bb5082f01a1186b910b0d
Files:
1
packages/linux/linux-2.6.21/gumstix-connex/defconfig
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/linux/linux-2.6.21/pxafb-definition.patch
packages/avahi/avahi-0.6.15
packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
packages/avahi/avahi_0.6.15.bb
packages/avahi/avahi_0.6.16.bb
packages/avahi/avahi_0.6.17.bb
packages/avahi/avahi_0.6.18.bb
packages/libxslt/libxslt_1.1.12.bb
packages/twisted/twisted_1.2.0.bb
packages/qmake/qmake2-native-2.01a
packages/qmake/qmake2-native-2.10a
packages/qmake/qmake2-native_2.01a.bb
packages/qmake/qmake2-native_2.10a.bb
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/files/configure-check-pymod.patch
packages/bluez/bluez-libs_3.15.bb
packages/bluez/bluez-utils_3.15.bb
packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch
packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/xorg-app/sessreg_1.0.3.bb
packages/xorg-app/setxkbmap_1.0.4.bb
packages/xorg-app/xdm_1.1.6.bb
packages/xorg-app/xmodmap_1.0.3.bb
packages/xorg-app/xprop_1.0.3.bb
packages/xorg-app/xrdb_1.0.4.bb
packages/xorg-app/xsetroot_1.0.2.bb
packages/xorg-app/xvinfo_1.0.2.bb
packages/xorg-doc/xorg-sgml-doctools_1.2.bb
packages/xorg-driver/xf86-input-mouse_1.2.2.bb
packages/xorg-driver/xf86-video-ati_6.6.193.bb
packages/xorg-driver/xf86-video-nv_2.1.3.bb
packages/xorg-driver/xf86-video-savage_2.1.3.bb
packages/xorg-lib/diet-x11_1.1.3.bb
packages/xorg-lib/libice_1.0.4.bb
packages/xorg-lib/libx11_1.1.3.bb
packages/xorg-lib/libxaw_1.0.4.bb
packages/xorg-lib/libxpm_3.5.7.bb
packages/xorg-lib/libxrender_0.9.3.bb
packages/xorg-lib/libxtst_1.0.3.bb
packages/xorg-lib/xtrans_1.0.4.bb
MAINTAINERS
packages/angstrom/angstrom-gpe-task-apps.bb
packages/angstrom/angstrom-gpe-task-base.bb
packages/angstrom/angstrom-gpe-task-game.bb
packages/angstrom/angstrom-gpe-task-pim.bb
packages/angstrom/angstrom-gpe-task-settings.bb
packages/angstrom/angstrom-ohand-task-pim.bb
packages/angstrom/angstrom-task-office.bb
packages/angstrom/angstrom-task-printing.bb
packages/angstrom/angstrom-task-sectest.bb
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/dbus/dbus-glib-native_0.72.bb
packages/e17/exhibit_cvs.bb
packages/e17/expedite_cvs.bb
packages/gstreamer/gst-plugins-bad_0.10.3.bb
packages/gstreamer/gst-plugins-bad_0.10.5.bb
packages/gstreamer/gstreamer.inc
packages/gtk+/gtk+_2.10.14.bb
packages/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/tasks/task-dvb.bb
packages/tasks/task-e-x11.bb
packages/tasks/task-gmae.bb
packages/tasks/task-gpe-apps.bb
packages/tasks/task-gpe-base.bb
packages/tasks/task-gpe-connectivity.bb
packages/tasks/task-gpe-desktopapps.bb
packages/tasks/task-gpe-games.bb
packages/tasks/task-gpe-pim.bb
packages/tasks/task-gpe-sectest.bb
packages/tasks/task-gpe-settings.bb
packages/tasks/task-gpe-web.bb
packages/tasks/task-gpe.bb
packages/tasks/task-gpephone.bb
packages/tasks/task-mokogateway.bb
packages/tasks/task-mythfront.bb
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-opie-apps.bb
packages/tasks/task-opie-games.bb
packages/tasks/task-opie.bb
packages/tasks/task-proper-tools.bb
packages/tasks/task-qpe.bb
packages/tasks/task-sdl.bb
packages/tasks/task-xfce-base.bb
packages/tasks/task-xterminal.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
Diffs:

#
# mt diff -r045e56420da1d629481fa1a4c311ddb81cfd68d8 -r215bca295ed86f179e1bb5082f01a1186b910b0d
#
# 
# 
# patch "packages/linux/linux-2.6.21/gumstix-connex/defconfig"
#  from [7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7]
#    to [f82cfed3811c4f324050d27969e73ad8a008f46e]
# 
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
#  from [62c342f45eeb5b3ed2ad8b3df1ba17710c322b17]
#    to [5f9766e89329659ec9ed5e12719b7c420d2b0d59]
# 
# patch "packages/linux/linux-2.6.21/pxafb-definition.patch"
#  from [e5b26a71fa9b5f9747529b0c2e4511ba69a62863]
#    to [3f551723318f273529c1476662366c551c57e2c7]
# 
============================================================
--- packages/linux/linux-2.6.21/gumstix-connex/defconfig	7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7
+++ packages/linux/linux-2.6.21/gumstix-connex/defconfig	f82cfed3811c4f324050d27969e73ad8a008f46e
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21
-# Mon Jul  2 16:48:14 2007
+# Thu Aug 23 09:32:16 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -34,7 +34,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
 #
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="gum"
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
@@ -213,7 +213,7 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ALIGNMENT_HANDLING=0x02
+CONFIG_ALIGNMENT_HANDLING=0x2
 
 #
 # Boot options
@@ -262,9 +262,9 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=m
+CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
+CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
@@ -1105,6 +1105,8 @@ CONFIG_FB_PXA_SHARP_LQ043_PSP=y
 CONFIG_FB_PXA=m
 # CONFIG_FB_PXA_ALPS_CDOLLAR is not set
 CONFIG_FB_PXA_SHARP_LQ043_PSP=y
+# CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C is not set
+# CONFIG_FB_PXA_NONEOFTHEABOVE is not set
 CONFIG_FB_PXA_PARAMETERS=y
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
============================================================
--- packages/linux/linux-2.6.21/gumstix-verdex/defconfig	62c342f45eeb5b3ed2ad8b3df1ba17710c322b17
+++ packages/linux/linux-2.6.21/gumstix-verdex/defconfig	5f9766e89329659ec9ed5e12719b7c420d2b0d59
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21
-# Thu Aug 23 14:02:59 2007
+# Thu Aug 23 09:30:49 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -28,30 +28,26 @@ CONFIG_BROKEN_ON_SMP=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
 #
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="gum"
 CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 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_IKCONFIG is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -80,8 +76,8 @@ CONFIG_MODULE_UNLOAD=y
 #
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 
@@ -179,7 +175,8 @@ CONFIG_XSCALE_PMU=y
 #
 # Bus support
 #
-# CONFIG_PROC_GPIO is not set
+CONFIG_PROC_GPIO=m
+# CONFIG_PROC_GPIO_DEBUG is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -198,11 +195,11 @@ CONFIG_PCMCIA_PXA2XX=m
 #
 # Kernel Features
 #
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_OABI_COMPAT is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -215,7 +212,7 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ALIGNMENT_HANDLING=0x3
+CONFIG_ALIGNMENT_HANDLING=0x2
 
 #
 # Boot options
@@ -238,16 +235,13 @@ CONFIG_KEXEC=y
 #
 # 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=m
+# CONFIG_BINFMT_MISC is not set
 
 #
 # Power management options
@@ -552,9 +546,14 @@ CONFIG_BT_HIDP=m
 #
 # Bluetooth device drivers
 #
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_HCIUART_BCSP 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
@@ -647,7 +646,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
 #
 CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_GUMSTIX is not set
+CONFIG_MTD_GUMSTIX=y
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_SHARP_SL is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -694,6 +693,7 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -702,7 +702,7 @@ CONFIG_IDE=m
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=m
-CONFIG_IDE_MAX_HWIFS=2
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=m
 
 #
@@ -822,9 +822,9 @@ CONFIG_NET_ETHERNET=y
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_SMC91X=y
-CONFIG_SMC91X_GUMSTIX=y
+CONFIG_MII=m
+CONFIG_SMC91X=m
+CONFIG_SMC91X_GUMSTIX=m
 # CONFIG_DM9000 is not set
 # CONFIG_SMC911X is not set
 
@@ -869,6 +869,7 @@ CONFIG_NET_RADIO=y
 #
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -908,7 +909,7 @@ CONFIG_SLHC=m
 #
 # Input device support
 #
-CONFIG_INPUT=m
+CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 
 #
@@ -917,16 +918,26 @@ CONFIG_INPUT_TSDEV=m
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_TSDEV=m
-CONFIG_INPUT_TSDEV_SCREEN_X=240
-CONFIG_INPUT_TSDEV_SCREEN_Y=320
+CONFIG_INPUT_TSDEV_SCREEN_X=480
+CONFIG_INPUT_TSDEV_SCREEN_Y=272
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers
 #
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=m
+# 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_KEYBOARD_GPIO is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_SERIAL 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
@@ -942,13 +953,19 @@ CONFIG_TOUCHSCREEN_UCB1400=m
 #
 # Hardware I/O ports
 #
-# CONFIG_SERIO is not set
+CONFIG_SERIO=m
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_LIBPS2=m
+# CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
 
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -982,6 +999,11 @@ CONFIG_SA1100_WATCHDOG=m
 #
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_SA1100_WATCHDOG=m
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_DTLK is not set
@@ -1067,8 +1089,7 @@ CONFIG_I2C_PXA_SLAVE=y
 #
 # LED devices
 #
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+# CONFIG_NEW_LEDS is not set
 
 #
 # LED drivers
@@ -1077,10 +1098,6 @@ CONFIG_LEDS_CLASS=m
 #
 # LED Triggers
 #
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 
 #
 # Multimedia devices
@@ -1091,43 +1108,62 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
 #
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_FB=m
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
+CONFIG_FB_TILEBLITTING=y
 
 #
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_PXA=m
+CONFIG_FB_PXA=y
 # CONFIG_FB_PXA_ALPS_CDOLLAR is not set
-CONFIG_FB_PXA_SHARP_LQ043_PSP=y
-# CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C is not set
+# CONFIG_FB_PXA_SHARP_LQ043_PSP is not set
+CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C=y
+# CONFIG_FB_PXA_NONEOFTHEABOVE is not set
 CONFIG_FB_PXA_PARAMETERS=y
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
 
 #
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+CONFIG_FONT_6x11=y
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
 # Logo configuration
 #
 CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
 
 #
@@ -1148,7 +1184,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 
@@ -1168,6 +1204,11 @@ CONFIG_SND_PXA2XX_AC97=m
 CONFIG_SND_PXA2XX_AC97=m
 
 #
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
 # PCMCIA devices
 #
 # CONFIG_SND_VXPOCKET is not set
@@ -1213,38 +1254,138 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
 
 #
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
 #
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_MON is not set
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
 # USB Gadget Support
 #
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_GADGET_SELECTED=y
-CONFIG_USB_GADGET_GUMSTIX=m
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-CONFIG_USB_GADGET_PXA27X=y
-CONFIG_USB_PXA27X=m
-# CONFIG_USB_PXA27X_DMA is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_G_SERIAL=m
-# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_GADGET is not set
 
 #
 # MMC/SD Card support
@@ -1481,7 +1622,6 @@ CONFIG_TIMER_STATS=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -1489,7 +1629,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
============================================================
--- packages/linux/linux-2.6.21/pxafb-definition.patch	e5b26a71fa9b5f9747529b0c2e4511ba69a62863
+++ packages/linux/linux-2.6.21/pxafb-definition.patch	3f551723318f273529c1476662366c551c57e2c7
@@ -120,7 +120,7 @@ Index: linux-2.6.21gum/drivers/video/Kco
 ===================================================================
 --- linux-2.6.21gum.orig/drivers/video/Kconfig
 +++ linux-2.6.21gum/drivers/video/Kconfig
-@@ -1495,6 +1495,34 @@ config FB_PXA
+@@ -1495,6 +1495,37 @@ config FB_PXA
  
  	  If unsure, say N.
  
@@ -150,6 +150,9 @@ Index: linux-2.6.21gum/drivers/video/Kco
 +	  Enable definitions for a Samsung LTE430WQ-F0C LCD panel, such as the ones resold
 +	  by gumstix for use with their "LCD-Ready" boards.
 +
++config FB_PXA_NONEOFTHEABOVE
++	boolean "None of the above"
++
 +endchoice
 +
  config FB_PXA_PARAMETERS


#
# mt diff -rb7def8e05c706107b7e68312f5e8ca17c4bdda6b -r215bca295ed86f179e1bb5082f01a1186b910b0d
#
# 
# 
# delete "packages/avahi/avahi-0.6.15"
# 
# delete "packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch"
# 
# delete "packages/avahi/avahi_0.6.15.bb"
# 
# delete "packages/avahi/avahi_0.6.16.bb"
# 
# delete "packages/avahi/avahi_0.6.17.bb"
# 
# delete "packages/avahi/avahi_0.6.18.bb"
# 
# delete "packages/libxslt/libxslt_1.1.12.bb"
# 
# delete "packages/twisted/twisted_1.2.0.bb"
# 
# rename "packages/qmake/qmake2-native-2.01a"
#     to "packages/qmake/qmake2-native-2.10a"
# 
# rename "packages/qmake/qmake2-native_2.01a.bb"
#     to "packages/qmake/qmake2-native_2.10a.bb"
# 
# add_file "packages/avahi/avahi-python_0.6.21.bb"
#  content [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
# 
# add_file "packages/avahi/files/configure-check-pymod.patch"
#  content [fb42206ea64396e348587b85e86e397a4a94004a]
# 
# add_file "packages/bluez/bluez-libs_3.15.bb"
#  content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
# 
# add_file "packages/bluez/bluez-utils_3.15.bb"
#  content [a6515be5f7deaf5c7ae08f4d976c5b84644d682f]
# 
# add_file "packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch"
#  content [a6b4fce6163979c9ab25466b6441bb3449e61352]
# 
# add_file "packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch"
#  content [9f82aa13d680670f6f41c683f61e814cae67d056]
# 
# add_file "packages/uicmoc/uicmoc4-native_4.3.1.bb"
#  content [9a5b3e0cf118671e949e94f3ccdfdc0106bf1511]
# 
# add_file "packages/xorg-app/sessreg_1.0.3.bb"
#  content [01867a4953d810e2f0804b3354cfcb2a2ff73954]
# 
# add_file "packages/xorg-app/setxkbmap_1.0.4.bb"
#  content [51d21b1d9395a9a3c45b74eb2f35d90d14b6f258]
# 
# add_file "packages/xorg-app/xdm_1.1.6.bb"
#  content [13b745771af2f8c3b3752f2d1017ad34f48d91bc]
# 
# add_file "packages/xorg-app/xmodmap_1.0.3.bb"
#  content [3fab59376a8e08e17227a84ab1610760fca1276d]
# 
# add_file "packages/xorg-app/xprop_1.0.3.bb"
#  content [8572c25f6c26e8e8d5512f4b8183271f3cb8a081]
# 
# add_file "packages/xorg-app/xrdb_1.0.4.bb"
#  content [50cb61f5911a30c66e5aa43a50bad7edfac2a5f7]
# 
# add_file "packages/xorg-app/xsetroot_1.0.2.bb"
#  content [c84c12a9d20aa36a5ccb5fc39af4a91c858026d5]
# 
# add_file "packages/xorg-app/xvinfo_1.0.2.bb"
#  content [fe0a792dccad6a93c31149fed9582885467428e6]
# 
# add_file "packages/xorg-doc/xorg-sgml-doctools_1.2.bb"
#  content [7a47d59f2ede9eabf6bd8d30f45dcc020b0dea84]
# 
# add_file "packages/xorg-driver/xf86-input-mouse_1.2.2.bb"
#  content [af8eb32d6b4525f9c5962de994c8bbb87154b4af]
# 
# add_file "packages/xorg-driver/xf86-video-ati_6.6.193.bb"
#  content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
# 
# add_file "packages/xorg-driver/xf86-video-nv_2.1.3.bb"
#  content [7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19]
# 
# add_file "packages/xorg-driver/xf86-video-savage_2.1.3.bb"
#  content [431c6f688a9a38de51d5980ebe5f0bfd1693d54b]
# 
# add_file "packages/xorg-lib/diet-x11_1.1.3.bb"
#  content [0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e]
# 
# add_file "packages/xorg-lib/libice_1.0.4.bb"
#  content [fccec7b08bd14f0a08f831b0716cf3130db09a1e]
# 
# add_file "packages/xorg-lib/libx11_1.1.3.bb"
#  content [54883ca7615919e5526df001f747727753b7c581]
# 
# add_file "packages/xorg-lib/libxaw_1.0.4.bb"
#  content [6bbfc6ccb9ebb2dd0386423df1b2f7061c5b3870]
# 
# add_file "packages/xorg-lib/libxpm_3.5.7.bb"
#  content [ae7544893d044dd97a8dd5a5c39383e3961707f3]
# 
# add_file "packages/xorg-lib/libxrender_0.9.3.bb"
#  content [4fa851509027bb6c796e012747ddcf719eded455]
# 
# add_file "packages/xorg-lib/libxtst_1.0.3.bb"
#  content [37a48e5c85460c1182084d396c7e2cd90cc8e227]
# 
# add_file "packages/xorg-lib/xtrans_1.0.4.bb"
#  content [5adfa3a5c753b71a9a61e266569ccbd26e940b09]
# 
# patch "MAINTAINERS"
#  from [78ace1245c132c22dcfc3a54a4a76692d9d0259a]
#    to [2b82e9a7ab1b0bd1c997519a4297c0fee2ec2ec7]
# 
# patch "packages/angstrom/angstrom-gpe-task-apps.bb"
#  from [43aa72a3f7bfd92362d682fdd4919d1bc0233364]
#    to [4e9cfc056a3b0448c82b619628fae2c396889c5f]
# 
# patch "packages/angstrom/angstrom-gpe-task-base.bb"
#  from [0bf76d6738a5513300fb44b9e760c30e6afefb63]
#    to [30a23f6dee4925d21a3bf27405e8f4c25f29be2c]
# 
# patch "packages/angstrom/angstrom-gpe-task-game.bb"
#  from [574b4b40ba91344f20ee266f571947eaf0bfabbf]
#    to [71196080803ea00dd59109c8bfa62ada41174b88]
# 
# patch "packages/angstrom/angstrom-gpe-task-pim.bb"
#  from [f95eb6c7ed13685671dbf9265a2096da41d4ec9a]
#    to [4720d5f026284dfb4a8f89cf99a2292cde8f4146]
# 
# patch "packages/angstrom/angstrom-gpe-task-settings.bb"
#  from [56e2c9ad5b4b1f6a1e92d8cd9ba55e2686f6cdcc]
#    to [04963f41f9195b2a20bddc9409a53ad153e779ff]
# 
# patch "packages/angstrom/angstrom-ohand-task-pim.bb"
#  from [6bd39e8996516c93fbf18298e7db73e5d6c7b5d2]
#    to [29117cd156e8860200d303c5d915d94029800006]
# 
# patch "packages/angstrom/angstrom-task-office.bb"
#  from [00b86208ff79a87aa59575a1613ff5dd050b9455]
#    to [68c13e992cbf4346142df95f6e0603b303c26778]
# 
# patch "packages/angstrom/angstrom-task-printing.bb"
#  from [1ed146611164572e7746082b18da64219484cd54]
#    to [37b5d726438ed3ba8ab86c1f272d8150c4e2dd8d]
# 
# patch "packages/angstrom/angstrom-task-sectest.bb"
#  from [0b52dec0b07a55dc09bbd4baefb5ac4ec3cab5b7]
#    to [0df8c6eb7d44b4b09ee6daecc100e47abb3ede24]
# 
# patch "packages/avahi/avahi.inc"
#  from [03b0814e1e63c9be9351f7fae999fbddef477289]
#    to [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
# 
# patch "packages/avahi/avahi_0.6.19.bb"
#  from [d05ccdc8b01300ebcd02a122fc5e269a287b8749]
#    to [80d86f2e2b46546f508edb4d277fa1ef7bceb3b7]
# 
# patch "packages/avahi/avahi_0.6.20.bb"
#  from [efe6d7c1e1a4684e2c363eb2dd156224be266a30]
#    to [617eee50014403513ca14be25fd16c61c19bac14]
# 
# patch "packages/avahi/avahi_0.6.21.bb"
#  from [cac0fe1735df745ea9c7a235c47d4a31fcf7f7e1]
#    to [5650246fb735e81ed906707d2b67bb821765b83c]
# 
# patch "packages/dbus/dbus-glib-native_0.72.bb"
#  from [278c6e1074af019c5bf108638bebfba814ddc160]
#    to [5c8a08a3c0bc93f2de4060d523738b5500cd88c0]
# 
# patch "packages/e17/exhibit_cvs.bb"
#  from [29fad610360202f480fede26fb0c3c7c81eca8e7]
#    to [fd141a172c394c58b0e20dad078fce7046c83fc4]
# 
# patch "packages/e17/expedite_cvs.bb"
#  from [bc914a4638fd17187a62865f8ef6eabe671cb56f]
#    to [d6c491e48f867162a8690fce0bf8044dcb7136bc]
# 
# patch "packages/gstreamer/gst-plugins-bad_0.10.3.bb"
#  from [091c86318da723ac2f5b9708ab9e4cfc39377038]
#    to [60a05cd17775d229c49cc169df51e4e7b5ff222b]
# 
# patch "packages/gstreamer/gst-plugins-bad_0.10.5.bb"
#  from [75bf6241ad32f530a27b0904e7a6c3053c231c9d]
#    to [06debe7657e7ce9b321d646ac413276b0ff212ac]
# 
# patch "packages/gstreamer/gstreamer.inc"
#  from [4373e3c63e98e5e7231ff03f8d1ae556374e045f]
#    to [a0978cb2802d28b839bb88552a3c5a57a9bf1d23]
# 
# patch "packages/gtk+/gtk+_2.10.14.bb"
#  from [b7a85a029e4d690ccbcfaae174f1f1950723c46d]
#    to [8ae4f9f76c8a1af983ec950a2c99047c7a8a0cc2]
# 
# patch "packages/qmake/qmake2-native_2.10a.bb"
#  from [b58e6dceed352069e13fc28ed8c4120809744506]
#    to [cdb348a27145a7e57dc38436ead198f972573f04]
# 
# patch "packages/tasks/task-base.bb"
#  from [fe2979cb73be668163bfcc4d8438f2aef96d197b]
#    to [f226a9b74f22d388d492ca278393475a549a6469]
# 
# patch "packages/tasks/task-boot.bb"
#  from [0a607d5e5b7ae509d565fbbb3b925a3b21b28292]
#    to [c23c7a613f0b88d6f60bc742ec8af93640b7ebc7]
# 
# patch "packages/tasks/task-dvb.bb"
#  from [e97311dda09c583e443eb8d584d70013d5a9752a]
#    to [d0b580515a75dbbdb39c4b7e4f845033652fca41]
# 
# patch "packages/tasks/task-e-x11.bb"
#  from [5d4cab35fb3d671aabdf25040e26d1b8c29ae706]
#    to [6b5175734cf987a2e61042f94659d72151ac8838]
# 
# patch "packages/tasks/task-gmae.bb"
#  from [da0fc8581e2e382338b0673b4e59d4d4af906fff]
#    to [bc361109a67390638c62cd8ad9951d21c26a3f06]
# 
# patch "packages/tasks/task-gpe-apps.bb"
#  from [f9b0521eb9c70cf4c727468de9f158d4862e3913]
#    to [441eab197bd9798e82d054b10892ef79ea23c9c4]
# 
# patch "packages/tasks/task-gpe-base.bb"
#  from [248daeca565cf97b75e833c4dcd52f3d687f634e]
#    to [ab132c0f7f2cb6b6cfb49188855c0c5345502b81]
# 
# patch "packages/tasks/task-gpe-connectivity.bb"
#  from [56c43e4bde77ad931eb095aadde525e8c8a325e4]
#    to [66a16f3b25fa29c93f5f8c58dfcb6eb17ae71761]
# 
# patch "packages/tasks/task-gpe-desktopapps.bb"
#  from [81a2bc87d3c4d7f54827c23561a6a3d789f7db2b]
#    to [fb7ce22094506055002c2309838eeeff2877f5eb]
# 
# patch "packages/tasks/task-gpe-games.bb"
#  from [5c5d0cd44736fa92600e96f9cbf0183021fa85dd]
#    to [f2538ca710d41e9be3bce81471173111863558a2]
# 
# patch "packages/tasks/task-gpe-pim.bb"
#  from [820d21530a16077c66ee1e05f9b90d472c4829ff]
#    to [45b2dc91fcf50d2b57117f70a762176a664f6ae4]
# 
# patch "packages/tasks/task-gpe-sectest.bb"
#  from [84fa13529206a1c3f88d6fdffc5da80b79bcd10c]
#    to [01b6679530b92aa7e2abffbbd20421ac63960b09]
# 
# patch "packages/tasks/task-gpe-settings.bb"
#  from [e2954cba1dede6e2a966fbf9589afbd2de1cb6d7]
#    to [22acf3e3699630d32f32ad8c00db79dd9bca992d]
# 
# patch "packages/tasks/task-gpe-web.bb"
#  from [0a675047bd8b7c48761317cbcded83167b1800d4]
#    to [c8f046b12c0ba8dbf6d7510848ea437f21929e91]
# 
# patch "packages/tasks/task-gpe.bb"
#  from [cb4baeeea50ecdf6485cc9fdd8b4a96b6f2b00e2]
#    to [6d67c2a586f7786deaf06a8760041f2b4f96e72e]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [8ad1cb7e128bf7c713a3601294598f2f45cbdbf2]
#    to [32f3ddece27b455887f907603ffe167f70aaadd7]
# 
# patch "packages/tasks/task-mokogateway.bb"
#  from [cca68ea72f5d84032e651bc005390558dc96dcb5]
#    to [5e12100a7a593a84f09f7bd4ebce36d0ba4865f8]
# 
# patch "packages/tasks/task-mythfront.bb"
#  from [99f682fdb8786fe44425466c0e958e57d9f4d0cf]
#    to [9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9]
# 
# patch "packages/tasks/task-opie-16mb.bb"
#  from [c0a18727fc19ff18cf71d626b50d65ff16793273]
#    to [3573b05667876fc3c7747ce95d4433bd8d14b416]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [f882913a23b727a2f228423837f49cd69400af8b]
#    to [86ca8dc0275a5b8803e7637f1535121d73aa1fbb]
# 
# patch "packages/tasks/task-opie-apps.bb"
#  from [e192666adc8ea55dfd2d13880e39567451ff691b]
#    to [a0cf1520578fa36ea0181cd808c6885c6cf7d8b5]
# 
# patch "packages/tasks/task-opie-games.bb"
#  from [16c0e4e90b8f2a1107b929ac2cb5ddb8abd15f10]
#    to [62413c817012ca1ca8a7342ea3fae26b92672e23]
# 
# patch "packages/tasks/task-opie.bb"
#  from [3dd6719f9c7ba4832d9d3d9e23b649733e187673]
#    to [33f680faf713d2b125f51eb210a4b761bb5784c2]
# 
# patch "packages/tasks/task-proper-tools.bb"
#  from [ef2689130c9052ea04a979f29a265f575b783aa0]
#    to [19579ef6eea2dd2ffcf3fc6b9647a580c5f51cab]
# 
# patch "packages/tasks/task-qpe.bb"
#  from [067b3304f1e3f987b06d5928cff877b86572bc8e]
#    to [3c20204c3ba7122687a68e5d4dcb334d32570826]
# 
# patch "packages/tasks/task-sdl.bb"
#  from [149ccaa5d730299d35fb73acc6d38481deba29ea]
#    to [ccc842048039b23bb776391ae8290cc24e96148b]
# 
# patch "packages/tasks/task-xfce-base.bb"
#  from [2ba45c027c2fde294c2bb4ad584d788bc330038d]
#    to [addec9b6129ccc1aa3a126f2d93a26c0dcc691ce]
# 
# patch "packages/tasks/task-xterminal.bb"
#  from [a90c170fd1a87a96fd18a14180b2abbc80d180c7]
#    to [3d1ffb522b93aa212cfa3b349e262727063ac56c]
# 
# patch "packages/uicmoc/uicmoc4-native_4.2.3.bb"
#  from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
#    to [80dd401b3668e6f4f71b2e43bfff330d9196e7a9]
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#  from [8520da26a06ef5cd286a9749b5a8e78337c3f665]
#    to [bd07c0050ef051ca21f2712499797670879d8879]
# 
============================================================
--- packages/avahi/avahi-python_0.6.21.bb	3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
+++ packages/avahi/avahi-python_0.6.21.bb	3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
@@ -0,0 +1,14 @@
+require avahi.inc
+PR = "r0"
+
+# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
+FILES_avahi-discover = ""
+
+PROVIDES = "avahi"
+DEPENDS += "python-native"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \
+            file://configure-check-pymod.patch;patch=1"
+S = "${WORKDIR}/avahi-${PV}"
+
+AVAHI_PYTHON = "--enable-python"
============================================================
--- packages/avahi/files/configure-check-pymod.patch	fb42206ea64396e348587b85e86e397a4a94004a
+++ packages/avahi/files/configure-check-pymod.patch	fb42206ea64396e348587b85e86e397a4a94004a
@@ -0,0 +1,27 @@
+Index: avahi-0.6.21/configure.ac
+===================================================================
+--- avahi-0.6.21.orig/configure.ac	2007-08-16 21:36:12.000000000 +0200
++++ avahi-0.6.21/configure.ac	2007-08-16 21:45:14.000000000 +0200
+@@ -700,10 +700,6 @@
+         esac],
+         [HAVE_PYGTK=yes])
+     
+-    if test "x$HAVE_PYGTK" = "xyes" ; then
+-        AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
+-    fi
+-
+ 
+     if test "x$HAVE_DBUS" = "xyes" ; then
+         AC_ARG_ENABLE(python-dbus,
+@@ -715,11 +711,6 @@
+             esac],
+             [HAVE_PYTHON_DBUS=yes])
+     
+-        if test "x$HAVE_PYTHON_DBUS" = "xyes"; then
+-            AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)])
+-        fi
+-
+-        AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+         if test "x$HAVE_GDBM" = "xyes"; then
+             AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+         fi
============================================================
--- packages/bluez/bluez-libs_3.15.bb	dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.15.bb	dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils_3.15.bb	a6515be5f7deaf5c7ae08f4d976c5b84644d682f
+++ packages/bluez/bluez-utils_3.15.bb	a6515be5f7deaf5c7ae08f4d976c5b84644d682f
@@ -0,0 +1,116 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+# ti patch doesn't apply, people using it should rediff it and send it upstream
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+           file://hcid.conf \
+#           file://hciattach-ti-bts.patch;patch=1 \
+          "
+PR = "r0"
+
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --enable-alsa \ 
+		 --enable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+# The config options are explained below:
+
+#  --enable-obex           enable OBEX support
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-cups           install CUPS backend support
+#  --enable-bccmd          install BCCMD interface utility
+#  --enable-avctrl         install Audio/Video control utility
+#  --enable-hid2hci        install HID mode switching utility
+#  --enable-dfutool        install DFU firmware upgrade utility
+
+#  --enable-glib           For systems that use and install GLib anyway
+#  --disable-sdpd          The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+#	--enable-network
+#	--enable-serial
+#	--enable-input
+#	--enable-audio
+#	--enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+#	--enable-configfile
+#	--enable-initscripts
+
+#For even smaller -doc packages
+#	--disable-manpages
+#	--disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+#	--disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat ${PN}-alsa"
+
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+			 " 
+
+FILES_${PN} = " \
+               ${base_sbindir}/hcid \
+               ${libdir}/bluetooth \
+               ${sysconfdir}/init.d/bluetooth \
+               ${sysconfdir}/bluetooth/*.service \
+               ${sysconfdir}/%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list