From 8995eae39a3484669aa6cc1e9355d8119f7df407 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 9 Jul 2006 10:42:03 +0000
Subject: angstrom-2006.9: pinch some preferred providers from Poky* * this
 commit message wasn't sponsored by o-hand.com ;)

---
 conf/distro/angstrom-2006.9.conf | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'conf/distro')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 9b9b4c6441..07e1bd4baa 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -45,11 +45,6 @@ GPE_EXTRA_INSTALL = ""
 # E
 include conf/distro/preferred-e-versions.inc
 
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
-
-
 #Make sure we use 2.6 on machines with a 2.4/2.6 selector
 KERNEL = "kernel26"
 MACHINE_KERNEL_VERSION = "2.6"
@@ -58,8 +53,21 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
+# Libc/uclibc:
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libiconv ?= glibc
+PREFERRED_PROVIDER_virtual/libintl ?= glibc
+
+# Virtuals:
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
+
+# Others:
+PREFERRED_PROVIDER_libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_gconf ?= gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
+PREFERRED_PROVIDER_tslib ?= tslib
 
 #EABI stuff
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
-- 
cgit v1.2.3