kaeilos.conf : version upgrade, bump pr

1 files changed, 23 insertions, 19 deletions

diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 6625ba1dd7..09a48e2294 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -2,21 +2,19 @@
 #@TYPE: Distribution
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
-#              based on Angstrom configuration file
+#              This version is strictly conformed to Angstrom 
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 11-01-2010
+#@VERSION: 23-11-2010
 #
 # 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
+# Product website : http://www.KaeilOS.com
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2009.1"
-DISTRO_VERSION = "2009.1-test-${DATE}"
-DISTRO_REVISION = "1"
-DISTRO_PR = ".5"
+#DISTRO_VERSION = "2009.2"
+DISTRO_VERSION = "2009.2-test-${DATE}"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".6"
 
 OLDEST_KERNEL ?= "2.6.16"
 
@@ -71,25 +69,31 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
+LINUX_LIBC_HEADERS_VERSION ?= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}"
+PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}"
 
 # see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9
-PREFERRED_VERSION_glibc 		?= "2.9"
+#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_uclibc        	?= "0.9.30.1"
-PREFERRED_VERSION_uclibc-initial	?= "0.9.30.1"
+PREFERRED_VERSION_uclibc        	?= "0.9.30.2"
+PREFERRED_VERSION_uclibc-initial	?= "0.9.30.2"
+PREFERRED_VERSION_eglibc			?= "2.9"
+PREFERRED_VERSION_eglibc-initial	?= "2.9"
 
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
 ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 
-# Blackfin has its own gcc
+# Blackfin has its on gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53"
 KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53"
+KERNEL_CCSUFFIX_archos5it = "-4.2.1+csl-arm-2007q3-53"
 
 #avr32 only has support for gcc 4.2.2
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
@@ -129,6 +133,10 @@ ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4
 
 ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
+ANGSTROM_BLACKLIST_pn-ipkg			= "ipkg has been superseded by opkg"
+
+ANGSTROMLIBC ?= "glibc"
+
 require conf/distro/include/kaeilos.inc
 
 # Toolchain virtuals:
@@ -144,8 +152,6 @@ PREFERRED_PROVIDER_virtual/update-alternatives = "opkg"
 
 # 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
 
@@ -169,7 +175,6 @@ DISTRO_EXTRA_RDEPENDS += "\
     util-linux-ng-mount util-linux-ng-umount \
     ${DEBUG_APPS} angstrom-libc-fixup-hack \
     "
-#   ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
 
 # This also hooks into task-base, but isn't mandatory.
 # If you don't want parts of this in your task-base using images you can put this in the image recipe:
@@ -189,9 +194,8 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     avahi-autoipd \
     openssh-sftp-server \
     ${DEBUG_APPS} \
-    "
+"
 
 SPLASH ?= "psplash"
-
 ARM_INSTRUCTION_SET_pn-uclibc = "arm"
 ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"