Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

12 files changed, 109 insertions, 26 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index f0b8a040ea..470c31a788 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -88,6 +88,8 @@ PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
 PREFERRED_PROVIDER_virtual/psplash               ?= "psplash-angstrom"
 
 PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
+PREFERRED_PROVIDER_virtual/gail    ?= "gtk+"
 
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 28de7667d5..5bf5b30d4c 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -6,12 +6,12 @@ PREFERRED_VERSION_cairo		= "1.8.0"
 PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
-PREFERRED_VERSION_glib-2.0 	= "2.20.0"
+PREFERRED_VERSION_glib-2.0 	= "2.20.4"
 PREFERRED_VERSION_glib-2.0-native = "2.18.0"
 PREFERRED_VERSION_glibmm = "2.18.0"
-PREFERRED_VERSION_glproto	= "1.4.9"      
+PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.16.0"
+PREFERRED_VERSION_gtk+		= "2.16.4"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
 PREFERRED_VERSION_hal		= "0.5.12"
 PREFERRED_VERSION_libgemwidget	= "1.0"
@@ -23,7 +23,7 @@ PREFERRED_VERSION_libtool-cross	= "2.2.4"
 PREFERRED_VERSION_libtool-sdk	= "2.2.4"
 PREFERRED_VERSION_libx11 = "1.2"
 PREFERRED_VERSION_mesa = "7.2"
-PREFERRED_VERSION_pango 	= "1.24.2"
+PREFERRED_VERSION_pango 	= "1.24.4"
 PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
new file mode 100644
index 0000000000..ba8d587241
--- /dev/null
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -0,0 +1,72 @@
+#@--------------------------------------------------------------------
+#@FILE: conf/distro/include/kaeilos-2009-preferred-versions.inc
+#@TYPE: Distribution
+#@NAME: KaeilOS(R) - http://www.kaeilos.com
+#@DESCRIPTION: KaeilOS Linux Distribution preferred version
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+#@VERSION: 01-07-2009
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com 
+#@--------------------------------------------------------------------
+
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_automake-native = "1.10.2"
+PREFERRED_VERSION_busybox 	= "1.13.2"
+PREFERRED_VERSION_cairo		= "1.8.0"
+PREFERRED_VERSION_dbus 		= "1.2.1"
+PREFERRED_VERSION_dropbear      = "0.51"
+PREFERRED_VERSION_fontconfig	= "2.6.0"
+PREFERRED_VERSION_glib-2.0 	= "2.20.0"
+PREFERRED_VERSION_glib-2.0-native = "2.18.0"
+PREFERRED_VERSION_glibmm = "2.18.0"
+PREFERRED_VERSION_glproto	= "1.4.9"      
+PREFERRED_VERSION_gst-pulse 	= "0.9.7"
+PREFERRED_VERSION_gtk+		= "2.16.0"
+PREFERRED_VERSION_gtkmm		= "2.14.1"
+PREFERRED_VERSION_hal		= "0.5.12"
+PREFERRED_VERSION_libgemwidget	= "1.0"
+PREFERRED_VERSION_libgpephone	= "0.4"
+PREFERRED_VERSION_libsdl-x11	= "1.2.11"
+PREFERRED_VERSION_libtool 	= "2.2.4"
+PREFERRED_VERSION_libtool-native = "2.2.4"
+PREFERRED_VERSION_libtool-cross	= "2.2.4"
+PREFERRED_VERSION_libtool-sdk	= "2.2.4"
+PREFERRED_VERSION_libx11 = "1.2"
+PREFERRED_VERSION_mesa = "7.2"
+PREFERRED_VERSION_pango 	= "1.24.2"
+PREFERRED_VERSION_pixman	= "0.13.2"
+PREFERRED_VERSION_pkgconfig	= "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio 	= "0.9.15"
+PREFERRED_VERSION_samba		= "3.3.0"
+PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
+
+PREFERRED_VERSION_udev 		= "141"
+UDEV_GE_141 = "1"
+
+PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_util-macros-native = "1.2.1"
+PREFERRED_VERSION_util-macros = "1.2.1"
+PREFERRED_VERSION_wpa-supplicant = "0.6.7"
+PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg = "1.6.1"
+
+#
+# meta-moblin package SRCREVs
+#
+SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9"
+SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8"
+SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184"
+SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c"
+SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48"
+SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f"
+SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
+SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
+
+
diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc
index de7dca7534..fc0348da28 100644
--- a/conf/distro/include/kaeilos.inc
+++ b/conf/distro/include/kaeilos.inc
@@ -56,15 +56,15 @@ THUMB_INTERWORK = "yes"
 
 
 #Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
+ANGSTROM_URI ?= "http://www.kaeilos.com"
 
 #Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list)
 # usefull for derivative distros and local testing
 # As this is runtime we can't and won't use virtual/feed-configs
 ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
 
-#Set the default maintainer to angstrom-dev
-MAINTAINER = "KaeilOS Developers <info@koansoftware.com>"
+#Set the default maintainer of kaeilos
+MAINTAINER = "KaeilOS Mantainer <m.cavallini@koansoftware.com>"
 
 #use debian style naming
 INHERIT += "debian"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 803d436bbf..5eff3db83b 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1429,7 +1429,7 @@ PREFERRED_VERSION_phoneserver ?= "1.0"
 PREFERRED_VERSION_php ?= "5.2.0"
 PREFERRED_VERSION_php-native ?= "5.2.0"
 PREFERRED_VERSION_picocom ?= "1.4"
-PREFERRED_VERSION_pidgin ?= "2.5.3"
+PREFERRED_VERSION_pidgin ?= "2.5.8"
 PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 992235a4b9..0eae85b686 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -63,11 +63,5 @@ PREFERRED_VERSION_udev				?= "118"
 
 ##################### Stuff with special notes, and broken stuff:
 
-# Hack alert - selecting this version of libusb effectively selects
-# the use of libusb1 and libusb-compat in the case that something
-# still depends on libusb. This is required because otherwise
-# libusb will overwrite libusb-compat in staging.
-PREFERRED_VERSION_libusb			?= "0.0.0"
-
 # boost 1.36 won't build
 PREFERRED_VERSION_boost				?= "1.33.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 470bace2b8..0e1a25a4b7 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -202,9 +202,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "209"
-SRCREV_pn-opkg-native ?= "209"
-SRCREV_pn-opkg-sdk ?= "209"
+SRCREV_pn-opkg ?= "215"
+SRCREV_pn-opkg-native ?= "215"
+SRCREV_pn-opkg-sdk ?= "215"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index b1b89b9870..903e5ed602 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -127,9 +127,11 @@ PREFERRED_PROVIDER_virtual/arm-linux-binutils		    = "binutils-cross"
 PREFERRED_PROVIDER_virtual/armeb-linux-binutils		    = "binutils-cross"
 PREFERRED_PROVIDER_linux-libc-headers			    = "linux-libc-headers"
 
-# Select the smallest provider of x11 libraries
-PREFERRED_PROVIDER_virtual/libx11		= "diet-x11"
-SRCDATE_diet-x11				?= "20060106"
+# Select the appropriate x11 library provider.  The diet-x11 libraries are
+# much smaller, but may not be as current as the standard x11 libraries; by
+# default we will select the standard libraries and permit the use of an
+# override if the user wishes (and has the correct PREFERRED_VERSIONs set).
+PREFERRED_PROVIDER_virtual/libx11		?= "libx11"
 
 # Ensure consistency across all SlugOS builds for the provider of a relational
 # database - use the latest version of the SleepyCat Berkeley database
@@ -159,6 +161,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm	?= "gtk+"
 
 PREFERRED_PROVIDER_avahi			?= "avahi"
 PREFERRED_PROVIDER_gconf			?= "gconf"
+PREFERRED_PROVIDER_virtual/libusb0		?= "libusb-compat"
 
 # Include any package preferred versions and srcrevs:
 
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index b7add998c7..5bec2d4d48 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,10 @@
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 23-06-2009 - B
+#@VERSION: 01-07-2009
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com
 #
 # Use this at your own risk, we welcome bugreports filed at 
 #    http://bugs.openembedded.net
@@ -12,14 +15,14 @@
 #DISTRO_VERSION = "2009.1"
 DISTRO_VERSION = "2009.1-test-${DATE}"
 DISTRO_REVISION = "1"
-DISTRO_PR = ".2"
+DISTRO_PR = ".3"
 
 #build staging from packages
 INHERIT += "packaged-staging"
 
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
-require conf/distro/include/angstrom-2008-preferred-versions.inc
+require conf/distro/include/kaeilos-2009-preferred-versions.inc
 require conf/distro/include/preferred-opie-versions-1.2.4.inc
 
 PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 34f92119b2..257d364292 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -31,7 +31,7 @@ USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
 USE_NLS_gcc-cross = "no"
 
-PREFERRED_VERSION_uclibc = "0.9.30"
-PREFERRED_VERSION_uclibc-initial = "0.9.30"
+PREFERRED_VERSION_uclibc = "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial = "0.9.30.1"
 
 require conf/distro/minimal.conf
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index f9c4670c67..8b834d0f4a 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -24,7 +24,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 # Use bluetooth 4.0
 DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
 
 #############################################################################
 # LIBRARY NAMES
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 93077e1025..bd3b93ec17 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -25,6 +25,15 @@ export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 
+# We are still using 2.4 embedix kernels
+COMPATIBLE_MACHINE_pn-c7x0-kernels = "(c7x0|corgi|husky|shepherd)"
+COMPATIBLE_MACHINE_pn-collie-kernels = "collie"
+COMPATIBLE_MACHINE_pn-poodle-kernels = "(poodle|poodle255)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa27x = "(akita|spitz|borzoi)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa = "(c7x0|corgi|husky|shepherd|poodle|poodle255|tosa)"
+COMPATIBLE_MACHINE_pn-openzaurus-sa = "collie"
+
+
 #
 # Base
 #