From: Rodrigo Vivi <rodrigo.vivi@openbossa.org>
Date: Thu, 23 Oct 2008 20:25:45 +0000 (-0300)
Subject: mamona.conf fix preferred versions and providers
X-Git-Tag: Release-2010-05/1~5696^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e3d7031bd5586f05c01c33ded38b0e21b58377d;p=openembedded.git

mamona.conf fix preferred versions and providers

* remove unused glibc-intermediate version 2.4 for i686
* add virtual/${TARGET_PREFIX}binutils preferred provider
* add linux-libc-headers preferred provider
* fix typo on preferred provider for gcc
* updating linux kernel version
---

diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf
index 264a064521..999c438e52 100644
--- a/conf/distro/mamona.conf
+++ b/conf/distro/mamona.conf
@@ -26,17 +26,17 @@ KERNEL = "kernel26"
 MACHINE_KERNEL_VERSION = "2.6"
 PREFERRED_VERSION_linux-omap1 ?= "2.6.22-omap1"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
-PREFERRED_VERSION_linux = "2.6.16"
+PREFERRED_VERSION_linux ?= "2.6.22"
 PREFERRED_VERSION_linux-libc-headers_nokia770 = "2.6.16.osso7"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 # Toolchain
 # =========
 
 # gcc
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 
 PREFERRED_VERSION_gcc ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross ?= "4.1.2"
@@ -45,6 +45,7 @@ PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2"
 
 # binutils
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_VERSION_binutils ?= "2.18"
 PREFERRED_VERSION_binutils-cross ?= "2.18"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
@@ -57,6 +58,7 @@ PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 
 PREFERRED_VERSION_glibc ?= "2.5"
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.5"
 PREFERRED_VERSION_uclibc ?= "0.9.29"