From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 Feb 2007 10:37:07 +0000 (+0000)
Subject: amsdelta-oe: make it angstrom based
X-Git-Tag: Release-2010-05/1~9230^2~31^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=543055f847be4ac652a340298b5abe21a93cc769;p=openembedded.git

amsdelta-oe: make it angstrom based
---

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 362e6e5a30..6e7adda029 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/include/familiar.inc
+require conf/distro/ansgstrom-2007.1.conf
 
 
 DISTRO_TYPE = "debug"
@@ -10,33 +10,6 @@ DISTRO_TYPE = "debug"
 #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
 
 
-FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-        updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
-
-#SRCDATE = 20050331
-#SRCDATE = "now"
-
-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"
-
-# The CSL compiler is unusable because
-# 1) certain programs stop to compile
-# 2) more programs segfault
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-
-#
-# PIN the familiar build to a version
-#
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-
 #
 # Opie
 #