conf/distro/kaeilos.conf completed previous modifications

 * aligned to latest Angstrom settings
 * removed xserver-kdrive as PREFERRED_PROVIDER_xserver
 * added OLDEST_KERNEL ?= "2.6.25"
 * reverted to PREFERRED_VERSION_glibc ?= "2.6.1" due to qemu compatibility issues

1 files changed, 16 insertions, 14 deletions

diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index d58f2d300c..421483ff6f 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -17,6 +17,8 @@ DISTRO_VERSION = "2009.1-test-${DATE}"
 DISTRO_REVISION = "1"
 DISTRO_PR = ".4"
 
+OLDEST_KERNEL ?= "2.6.28"
+
 #build staging from packages
 INHERIT += "packaged-staging"
 
@@ -25,10 +27,6 @@ require conf/distro/include/sane-srcrevs.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"
-PREFERRED_VERSION_busybox        = "1.13.2"
-IMAGE_DEV_MANAGER = "busybox-mdev"
-
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
 # 'release' no root password, no strace and gdb by default
@@ -77,8 +75,12 @@ 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.9"
-PREFERRED_VERSION_glibc-initial 	?= "2.9"
+PREFERRED_VERSION_glibc 		?= "2.6.1"
+PREFERRED_VERSION_glibc-initial 	?= "2.6.1"
+# Maybe one day I'll upgrade this too
+#PREFERRED_VERSION_glibc 		?= "2.9"
+#PREFERRED_VERSION_glibc-initial 	?= "2.9"
+
 PREFERRED_VERSION_uclibc        	?= "0.9.30"
 PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
 
@@ -92,10 +94,10 @@ PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
 #PREFERRED_PROVIDER_virtual/psplash               ?= "psplash-kaeilos"
 
 PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
+PREFERRED_PROVIDER_virtual/gail    ?= "gtk+"
 
-#Small machines prefer kdrive, but we might ship full Xorg in other images
-PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
-PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
+PREFERRED_PROVIDER_libfribidi = "fribidi"
 
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
@@ -132,9 +134,9 @@ PREFERRED_VERSION_gcc-cross-initial      ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
-require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+#require conf/distro/include/preferred-e-versions.inc
+#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
 #avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 = "2.17"
@@ -153,10 +155,9 @@ PREFERRED_PROVIDER_virtual/db           ?= "db"
 PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
-PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+#PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound               ?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf"
@@ -254,6 +255,7 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-ext3 \
     kernel-module-af-packet \
     openssh-sftp-server \
+    ${DEBUG_APPS} \
     "
 
 SPLASH ?= "psplash"