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

mickeyl commit openembedded-commits at lists.openembedded.org
Thu Mar 6 01:54:57 UTC 2008 

merge of '0a57519fa92d8220b35f8652e20fea9f7800058c'
     and '905ae47594d02fc2167e9ddde4d4b781dad04ac2'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 42541fe901599367ade24d50f0299e91a66181f2
ViewMTN: http://monotone.openembedded.org/revision/info/42541fe901599367ade24d50f0299e91a66181f2
Files:
1
packages/linux/gumstix-kernel-2.6.21/one-wire.patch
packages/linux/gumstix-kernel-2.6.21/pxafb-backto16.patch
packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch
packages/xorg-lib/libx11/include_fix.patch
conf/distro/include/sane-srcrevs.inc
conf/machine/gumstix-custom-connex.conf
conf/machine/gumstix-custom-verdex.conf
conf/machine/include/gumstix.inc
packages/libsexy/files/libsexy-pkgconfig-fixes.patch
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb
packages/linux/gumstix-kernel-2.6.21/tsc2003.c
packages/linux/gumstix-kernel_2.6.21.bb
packages/matchbox-stroke/matchbox-stroke_svn.bb
packages/uclibc/uclibc-initial_0.9.26.bb
packages/uclibc/uclibc-initial_0.9.27.bb
packages/uclibc/uclibc-initial_0.9.28.bb
packages/uclibc/uclibc-initial_0.9.29.bb
packages/uclibc/uclibc-initial_svn.bb
packages/uclibc/uclibc_0.9.28.bb
packages/uclibc/uclibc_0.9.29.bb
packages/xorg-lib/libx11_1.1.2.bb
packages/xorg-lib/libx11_1.1.3.bb
Diffs:

#
# mt diff -r0a57519fa92d8220b35f8652e20fea9f7800058c -r42541fe901599367ade24d50f0299e91a66181f2
#
# 
# no changes
# 


#
# mt diff -r905ae47594d02fc2167e9ddde4d4b781dad04ac2 -r42541fe901599367ade24d50f0299e91a66181f2
#
# 
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/one-wire.patch"
#  content [bb726dc64414c48e88be8b2b2acbb7acbe57408b]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/pxafb-backto16.patch"
#  content [a775afe87b0418531ed139958b630ca0b5320a1c]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch"
#  content [6e0c7c7aa4434946cf8b4cd831750fc911b71a8f]
# 
# add_file "packages/xorg-lib/libx11/include_fix.patch"
#  content [0ab3800c4a6e4765b4cd191be926e5223448cb4f]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [cee3f2f2e6478f02a5022c31afb8da91f4680f4a]
#    to [c7d0ad4faccc7664f24cec0e8e6628005208830a]
# 
# patch "conf/machine/gumstix-custom-connex.conf"
#  from [ac95db0e22ec8af5388a0b242c112c40311dce5a]
#    to [05a723884fce45522e2cc9f168d20d01db1590df]
# 
# patch "conf/machine/gumstix-custom-verdex.conf"
#  from [9c029062516b8df30d6c6b1c1c712931a98cabd8]
#    to [69993fa7747e890a57b860ed9c8c443d94d85c0b]
# 
# patch "conf/machine/include/gumstix.inc"
#  from [9891e8c2b2b2548f9e9a8a204dcaddffb58f81ab]
#    to [7578e77d24254c6b31c18d29909b2cdae25e53b8]
# 
# patch "packages/libsexy/files/libsexy-pkgconfig-fixes.patch"
#  from [e5931663a5d7b15ab427404822b3ef7e492a63ed]
#    to [be993ffcdaab12915f114debc9322ba26cb6268e]
# 
# patch "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig"
#  from [c68249c5af26ba1934586a39d104122d8f9866db]
#    to [e499e3772d204313a060d7ecb17c629d5986fbbb]
# 
# patch "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb"
#  from [6ba15dc60b3f98cbb67e726cc4adf75d4cfeab13]
#    to [6b5b2fd40d8befce8e26c2e629d8a26618084c3c]
# 
# patch "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig"
#  from [a172027521556198c8ba69d3b4cd86d42ca2b1fa]
#    to [2cffa8a884be704ea892d1c6651235b220f40429]
# 
# patch "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb"
#  from [199cea2b71e4ecdb6f9955a9c28eb586a0b0c0d7]
#    to [7ae6b784c995dff792e1c95822411667e032d210]
# 
# patch "packages/linux/gumstix-kernel-2.6.21/tsc2003.c"
#  from [eeb2850bcc15f83ff22d7cbf2e881f98b77081ab]
#    to [3d88771bf7e195cd7b70a35310b8bdf58b8878fd]
# 
# patch "packages/linux/gumstix-kernel_2.6.21.bb"
#  from [f8f775865e8b332af75c61be2a993ddb23996bf0]
#    to [abcf379ae73f3805d3364fbbf7d4e735d4c887b2]
# 
# patch "packages/matchbox-stroke/matchbox-stroke_svn.bb"
#  from [a36c7349be8c71c2865293331459db1a115f6167]
#    to [93dbbb8de1af5f0c7bcdeaa971624cbbbc27c1ba]
# 
# patch "packages/uclibc/uclibc-initial_0.9.26.bb"
#  from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
#    to [4add23305e16ae6d0973c44aae89b3f01d0f5bf8]
# 
# patch "packages/uclibc/uclibc-initial_0.9.27.bb"
#  from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
#    to [4add23305e16ae6d0973c44aae89b3f01d0f5bf8]
# 
# patch "packages/uclibc/uclibc-initial_0.9.28.bb"
#  from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
#    to [4add23305e16ae6d0973c44aae89b3f01d0f5bf8]
# 
# patch "packages/uclibc/uclibc-initial_0.9.29.bb"
#  from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
#    to [a0d57c9797c45aeb14ad2b30a6f31fbe6da13e05]
# 
# patch "packages/uclibc/uclibc-initial_svn.bb"
#  from [3aae2b84bccf50d43b3a3aa9b70d87d5941950cc]
#    to [c4bf20bfed551d292d63e31314bf2c9277f9d30e]
# 
# patch "packages/uclibc/uclibc_0.9.28.bb"
#  from [b04a09d0bf752830bae4c350abe0c396ea34005f]
#    to [75128d3a477983ee8b6277cedcd7609621f6fcfd]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [edbe56f785cf900a5e6bd127194027122bef9123]
#    to [fbb16deda11e2a7ee5fd50b757a8cc92d0bb3294]
# 
# patch "packages/xorg-lib/libx11_1.1.2.bb"
#  from [72fc7fde07ba2a58ea79355937eb2f6e1c0495be]
#    to [21405491fb1f9d79342a43068804f81e6413482f]
# 
# patch "packages/xorg-lib/libx11_1.1.3.bb"
#  from [54883ca7615919e5526df001f747727753b7c581]
#    to [21405491fb1f9d79342a43068804f81e6413482f]
# 
============================================================
--- packages/linux/gumstix-kernel-2.6.21/one-wire.patch	bb726dc64414c48e88be8b2b2acbb7acbe57408b
+++ packages/linux/gumstix-kernel-2.6.21/one-wire.patch	bb726dc64414c48e88be8b2b2acbb7acbe57408b
@@ -0,0 +1,35 @@
+--- linux-2.6.21/drivers/w1/w1.c
++++ linux-2.6.21/drivers/w1/w1.c
+@@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u64 rn)
+ 	struct w1_slave *sl;
+ 	struct list_head *ent;
+ 	struct w1_reg_num *tmp;
+-	int family_found = 0;
+ 	struct w1_master *dev;
+ 	u64 rn_le = cpu_to_le64(rn);
+ 
+@@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u64 rn)
+ 		    sl->reg_num.crc == tmp->crc) {
+ 			set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
+ 			break;
+-		} else if (sl->reg_num.family == tmp->family) {
+-			family_found = 1;
+-			break;
+ 		}
+ 
+ 		slave_count++;
+@@ -874,11 +874,9 @@ void w1_search_process(struct w1_master *dev, u8 search_type)
+	w1_search_devices(dev, search_type, w1_slave_found);
+
+	list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
+-		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) {
++		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl)
+			w1_slave_detach(sl);
+-
+-			dev->slave_count--;
+-		} else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
++		else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
+			sl->ttl = dev->slave_ttl;
+	}
+
+
============================================================
--- packages/linux/gumstix-kernel-2.6.21/pxafb-backto16.patch	a775afe87b0418531ed139958b630ca0b5320a1c
+++ packages/linux/gumstix-kernel-2.6.21/pxafb-backto16.patch	a775afe87b0418531ed139958b630ca0b5320a1c
@@ -0,0 +1,40 @@
+--- linux-2.6.21/arch/arm/mach-pxa/gumstix.c-orig	2008-02-20 16:18:57.000000000 -0800
++++ linux-2.6.21/arch/arm/mach-pxa/gumstix.c	2008-02-20 16:21:21.000000000 -0800
+@@ -146,8 +146,7 @@
+ 	.pixclock	= 110000,
+ 	.xres		= 480,
+ 	.yres		= 272,
+-	.bpp		= 18,
+-	.nonstd		= 24,
++	.bpp		= 16,
+ 	.hsync_len	= 41,
+ 	.left_margin	= 2,
+ 	.right_margin	= 2,
+@@ -161,7 +160,7 @@
+ 	.modes			= &gumstix_fb_mode,
+ 	.num_modes		= 1,
+ 	.lccr0			= LCCR0_Act | LCCR0_Sngl | LCCR0_Color,
+-	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (3 << 30),
++	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (0 << 30),
+ 	.pxafb_backlight_power	= &gumstix_lcd_backlight,
+ };
+ #elif defined(CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C)
+@@ -175,8 +174,7 @@
+ 	.vsync_len	= 10, // VLW from datasheet: 10 typ
+ 	.upper_margin	= 2, // VBP - VLW from datasheet: 12 - 10 = 2
+ 	.lower_margin	= 4, // VFP from datasheet: 4 typ
+-	.bpp		= 18,
+-	.nonstd		= 24,
++	.bpp		= 16,
+ 	.sync		= 0, // Hsync and Vsync both active low
+ };
+ 
+@@ -184,7 +182,7 @@
+ 	.modes			= &gumstix_fb_mode,
+ 	.num_modes		= 1,
+ 	.lccr0			= LCCR0_Act | LCCR0_Sngl | LCCR0_Color,
+-	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (3 << 30),
++	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (0 << 30),
+ 	.pxafb_backlight_power	= &gumstix_lcd_backlight,
+ };
+ #endif
============================================================
--- packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch	6e0c7c7aa4434946cf8b4cd831750fc911b71a8f
+++ packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch	6e0c7c7aa4434946cf8b4cd831750fc911b71a8f
@@ -0,0 +1,58 @@
+--- linux-2.6.21/drivers/net/gumstix-smc91x.c-orig	2008-02-24 22:06:30.000000000 -0800
++++ linux-2.6.21/drivers/net/gumstix-smc91x.c	2008-02-25 08:12:57.000000000 -0800
+@@ -90,18 +90,42 @@
+ 	pxa_gpio_mode(GPIO49_nPWE_MD);
+ 
+ 	pxa_gpio_mode(GPIO78_nCS_2_MD);
+-	// If either if statement fails, then we'll drop out and turn_off_eth1,
++
++  // First look for smc91x0
++	// If either if statement fails, then we'll drop out and turn_off_eth0,
++	// if both succeed, then we'll skip that and just proceed
++  // to test for 2 smc91x chips
++	if(request_mem_region(gumstix_smc91x0_resources[0].start, SMC_IO_EXTENT, "smc91x0 probe"))
++	{
++		ioaddr = ioremap(gumstix_smc91x0_resources[0].start, SMC_IO_EXTENT);
++		val = ioread16(ioaddr + BANK_SELECT);
++		iounmap(ioaddr);
++		release_mem_region(gumstix_smc91x0_resources[0].start, SMC_IO_EXTENT);
++		if ((val & 0xFF00) == 0x3300) {
++			goto proceed;
++		}
++	}
++
++  printk(KERN_ERR "%s: smc91x chip not found, returning -ENXIO\n", __FUNCTION__);
++  return -ENXIO;
++
++proceed:
++  printk(KERN_ERR "%s: smc91x chip found\n", __FUNCTION__);
++
++  // Now look for a second smc91x
++	// If either if statement fails, then we'll drop out and return -ENXIO
+ 	// if both succeed, then we'll skip that and just proceed with 2 cards
+-	if(request_mem_region(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT, "smc91x probe"))
++	if(request_mem_region(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT, "smc91x1 probe"))
+ 	{
+ 		ioaddr = ioremap(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT);
+ 		val = ioread16(ioaddr + BANK_SELECT);
+ 		iounmap(ioaddr);
+ 		release_mem_region(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT);
+ 		if ((val & 0xFF00) == 0x3300) {
+-			goto proceed;
++			goto proceed1;
+ 		}
+ 	}
++  
+ 
+ turn_off_eth1:
+ 	// This is apparently not an SMC91C111
+@@ -110,7 +134,8 @@
+ 	smc91x_devices[1] = NULL;
+ 	pxa_gpio_mode(78 | GPIO_IN);
+ 	
+-proceed:
++proceed1:
++  printk(KERN_ERR "%s: found %d smc91x chip(s)\n", __FUNCTION__);
+ 	pxa_gpio_mode(GPIO15_nCS_1_MD);
+ 
+ 	if(smc91x_devices[1]) pxa_gpio_mode(GPIO_GUMSTIX_ETH1_RST_MD);
============================================================
--- packages/xorg-lib/libx11/include_fix.patch	0ab3800c4a6e4765b4cd191be926e5223448cb4f
+++ packages/xorg-lib/libx11/include_fix.patch	0ab3800c4a6e4765b4cd191be926e5223448cb4f
@@ -0,0 +1,62 @@
+---
+ configure.ac |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac	2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac	2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+-	case "$KEYSYMDEF" in
+-	"")
+-		case "$flag" in
+-		*-I*)
+-			dir=`echo "$flag" | sed 's/ *-I//'`
+-			file="$dir/X11/keysymdef.h"
+-			if test -f "$file"; then
+-				KEYSYMDEF="$file"
+-			fi
++AC_ARG_WITH(keysymdef,
++	AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
++	KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++	for flag in $XPROTO_CFLAGS -I/usr/include; do
++		case "$KEYSYMDEF" in
++		"")
++			case "$flag" in
++			*-I*)
++				dir=`echo "$flag" | sed 's/ *-I//'`
++				file="$dir/X11/keysymdef.h"
++				if test -f "$file"; then
++					KEYSYMDEF="$file"
++				fi
++				;;
++			esac
+ 			;;
+ 		esac
+-		;;
+-	esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+-	AC_MSG_ERROR([Cannot find keysymdef.h])
+-	;;
+-*)
++	done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ 	AC_MSG_RESULT([$KEYSYMDEF])
+-        ;;
+-esac
++else
++	AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+ 
+ AC_ARG_ENABLE(udc,
============================================================
--- conf/distro/include/sane-srcrevs.inc	cee3f2f2e6478f02a5022c31afb8da91f4680f4a
+++ conf/distro/include/sane-srcrevs.inc	c7d0ad4faccc7664f24cec0e8e6628005208830a
@@ -61,6 +61,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-keyboard ?= "1739"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
+SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-moko-gtk-engine ?= "3405"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "24587"
@@ -97,7 +98,7 @@ SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3583"
+SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-messages2 ?= "3712"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
============================================================
--- conf/machine/gumstix-custom-connex.conf	ac95db0e22ec8af5388a0b242c112c40311dce5a
+++ conf/machine/gumstix-custom-connex.conf	05a723884fce45522e2cc9f168d20d01db1590df
@@ -33,8 +33,11 @@ MACHINE_FEATURES  += "sound"
 # if you enable robostix you will need to disable both "lcd" and "touchscreen" features
 #MACHINE_FEATURES  += "robostix"
 
-#MACHINE_FEATURES  += "lcd"
-#MACHINE_FEATURES  += "touchscreen"
+MACHINE_FEATURES  += "lcd"
+MACHINE_FEATURES  += "rgb16"
+#MACHINE_FEATURES  += "rgb18"
+
+MACHINE_FEATURES  += "touchscreen"
 #MACHINE_FEATURES  += "keyboard"
 
 MACHINE_FEATURES  += "pcmcia"
@@ -44,8 +47,12 @@ MACHINE_FEATURES  += "fat"
 MACHINE_FEATURES  += "ethernet"
 
 MACHINE_FEATURES  += "fat"
-#MACHINE_FEATURES  += "ext2"
+MACHINE_FEATURES  += "ext2"
 
+# enable one of the following if you want to target build for uimage/rootfs on mmc/microSD or CF
+#MACHINE_FEATURES  += "mmcroot"
+#MACHINE_FEATURES  += "cfroot"
+
 #
 # note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
 # for those features via task-base-gumstix.  Include below any extra kernel modules that you want installed
@@ -70,6 +77,7 @@ module_autoload_g_ether        = ${@base
 module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_ether', '',d)}
 #module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
 
+module_autoload_tsc2003        = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)}
 module_autoload_ucb1400-ts     = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)}
 module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
 
============================================================
--- conf/machine/gumstix-custom-verdex.conf	9c029062516b8df30d6c6b1c1c712931a98cabd8
+++ conf/machine/gumstix-custom-verdex.conf	69993fa7747e890a57b860ed9c8c443d94d85c0b
@@ -35,6 +35,9 @@ MACHINE_FEATURES  += "lcd"
 #MACHINE_FEATURES  += "robostix"
 
 MACHINE_FEATURES  += "lcd"
+#MACHINE_FEATURES  += "rgb16"
+MACHINE_FEATURES  += "rgb18"
+
 MACHINE_FEATURES  += "touchscreen"
 MACHINE_FEATURES  += "keyboard"
 
@@ -47,6 +50,10 @@ MACHINE_FEATURES  += "fat"
 MACHINE_FEATURES  += "ext2"
 MACHINE_FEATURES  += "fat"
 
+# enable one of the following if you want to target build for uimage/rootfs on mmc/microSD or CF
+#MACHINE_FEATURES  += "mmcroot"
+#MACHINE_FEATURES  += "cfroot"
+
 #
 # note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
 # for those features via task-base-gumstix.  Include below any extra kernel modules that you want installed
@@ -74,5 +81,6 @@ module_autoload_tsc2003        = ${@base
 #module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
 
 module_autoload_tsc2003        = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)}
+module_autoload_ucb1400-ts     = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)}
 module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
 
============================================================
--- conf/machine/include/gumstix.inc	9891e8c2b2b2548f9e9a8a204dcaddffb58f81ab
+++ conf/machine/include/gumstix.inc	7578e77d24254c6b31c18d29909b2cdae25e53b8
@@ -17,7 +17,7 @@ COMBINED_FEATURES ?= ""
 MACHINE_FEATURES += "kernel26 "
 COMBINED_FEATURES ?= ""
 
-IMAGE_FSTYPES = "jffs2"
+IMAGE_FSTYPES = "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
@@ -31,8 +31,11 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "
 # The following *should* be in a distro.conf file
 # We include them here to avoid creating a new distro
 
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
+
 PREFERRED_VERSION_gumstix-kernel = "2.6.21"
-PREFERRED_VERSION_udev = "115"
+PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_gnuplot = "4.0.0"
 PREFERRED_VERSION_dropbear = "0.47"
 PREFERRED_VERSION_wpa-supplicant = "0.5.8"
@@ -41,4 +44,11 @@ PREFERRED_VERSION_bluez-hcidump = "1.40"
 PREFERRED_VERSION_bluez-libs = "3.24"
 PREFERRED_VERSION_bluez-gstreame%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list