From: Koen Kooi <koen@openembedded.org>
Date: Wed, 31 Aug 2005 23:58:07 +0000 (+0000)
Subject: familiar distro files: make it harder to build unversioned distros and set preference... 
X-Git-Tag: Release-2010-05/1~9453^2~3713^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5caf636a7241c4df7e40699ea37798465670223;p=openembedded.git

familiar distro files: make it harder to build unversioned distros and set preferences for iconv
---

diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
index 7247bdfa53..dc333a3332 100644
--- a/conf/distro/familiar-0.8.3.conf
+++ b/conf/distro/familiar-0.8.3.conf
@@ -1,4 +1,4 @@
-include conf/distro/familiar.conf
+include conf/distro/familiar-distro.conf
 
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
@@ -17,6 +17,9 @@ 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
+PREFERRED_PROVIDER_x11=diet-x11
 
 # The CSL compiler is unusable because
 # 1) certain programs stop to compile
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar-distro.conf
similarity index 100%
rename from conf/distro/familiar.conf
rename to conf/distro/familiar-distro.conf