conf/distro/kaeilos.conf added new distro options

 * added TOOLCHAIN_TYPE management
 * switched to glibc 2.9
 * selected xserver-xorg as default, since kdrive has been EOL'ed
 * bumped PR

1 files changed, 34 insertions, 19 deletions

diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 5bec2d4d48..d58f2d300c 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,7 @@
 #@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: 01-07-2009
+#@VERSION: 21-10-2009
 #
 # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
 # Product website : http://www.KaeilOS.com
@@ -15,7 +15,7 @@
 #DISTRO_VERSION = "2009.1"
 DISTRO_VERSION = "2009.1-test-${DATE}"
 DISTRO_REVISION = "1"
-DISTRO_PR = ".3"
+DISTRO_PR = ".4"
 
 #build staging from packages
 INHERIT += "packaged-staging"
@@ -35,6 +35,10 @@ IMAGE_DEV_MANAGER = "busybox-mdev"
 DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
 
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
 # Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
 # shipping some adhoc subset will be still useless and size burden for
 # users of all other languages/countries. Instead, worth to make it easy
@@ -49,7 +53,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}
 EXTRA_IMAGECMD_ext2 = "-i 4096"
 
 # set feed path variables
-FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
 
 
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
@@ -73,8 +77,8 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc 		?= "2.6.1"
-PREFERRED_VERSION_glibc-initial 	?= "2.6.1"
+PREFERRED_VERSION_glibc 		?= "2.9"
+PREFERRED_VERSION_glibc-initial 	?= "2.9"
 PREFERRED_VERSION_uclibc        	?= "0.9.30"
 PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
 
@@ -112,10 +116,14 @@ ANGSTROM_GCC_VERSION_486sx = "4.3.2"
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION 			?= "4.2.4"
-PREFERRED_VERSION_binutils	?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross 	?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross-sdk 	?= "2.18.50.0.7"
+ANGSTROM_GCC_VERSION                     ?= "4.3.3"
+
+ANGSTROM_BINUTILS_VERSION                ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv7a         ?= "2.18.50.0.7"
+
+PREFERRED_VERSION_binutils               ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross         ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross-sdk     ?= "${ANGSTROM_BINUTILS_VERSION}"
 
 PREFERRED_VERSION_gcc                    ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross              ?= "${ANGSTROM_GCC_VERSION}"
@@ -133,15 +141,8 @@ PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 
-#Other packages version
-PREFERRED_VERSION_classpath ?= "0.97.2"
-
-# Virtuals:
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+# Toolchain virtuals:
+require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 
 # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
 PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
@@ -158,7 +159,7 @@ PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound               ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
+PREFERRED_PROVIDER_gconf                ?= "gconf"
 PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
 PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
 PREFERRED_PROVIDER_tslib                ?= "tslib"
@@ -166,9 +167,15 @@ PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
 PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
 PREFERRED_PROVIDER_ntp                  ?= "ntp"
 PREFERRED_PROVIDER_hotplug               = "udev"
+PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg"
 PREFERRED_PROVIDER_libxss                = "libxss"
 PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
 PREFERRED_PROVIDER_bluez-libs            = "bluez4"
+PREFERRED_PROVIDER_bluez-utils           = "bluez4"
+PREFERRED_PROVIDER_util-linux            = "util-linux-ng"
+
+ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
 
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
@@ -186,6 +193,9 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
+# QT stuff:
+# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
+PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
 
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
@@ -200,6 +210,11 @@ require conf/distro/include/kaeilos.inc
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
 IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
 
+# Select xserver-xorg as default, since kdrive has been EOL'ed
+XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" 
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+
 # do some task-base stuff here
 
 # Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with