diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-03-02 10:30:04 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-02 10:30:04 +0000 |
| commit | 5cd2591678a3265b4a29af3d8764cec060f4afbf (patch) | |
| tree | 346061d86c8db27b32008b486af5c1d28757fa8a /conf | |
| parent | 10651d7352cbd17d2a87b8e00e9e65475e7fa46b (diff) | |
angstrom-2006.9: move some preferred providers around so angstrom can override stuff in includes like e17 defining a gcc version (WTF?)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 0f8fe4e913..338e0ff17e 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -16,6 +16,25 @@ FEED_URIS += " \ #CVSDATE = 20050331 + +# Opie +include conf/distro/preferred-opie-versions.inc + +# GPE +include conf/distro/preferred-gpe-versions-2.8.inc + +# E +include conf/distro/preferred-e-versions.inc + +PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" +PREFERRED_VERSION_qte = "2.3.10" + + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +PREFERRED_PROVIDER_libx11 = "diet-x11" + + 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" @@ -25,8 +44,11 @@ PREFERRED_PROVIDER_virtual/libintl = "glibc" #EABI stuff #PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_gcc ?= "4.0.2" +PREFERRED_VERSION_gcc-cross ?= "4.0.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2" + -PREFERRED_PROVIDER_x11=diet-x11 #use EABI toolchain #PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214" @@ -41,29 +63,4 @@ PREFERRED_PROVIDER_x11=diet-x11 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -# -# Opie -# - -PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" -PREFERRED_VERSION_qte = "2.3.10" - -OPIE_VERSION = "1.2.1" -include conf/distro/preferred-opie-versions.inc - -# -# GPE -# - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_x11 = "diet-x11" - -include conf/distro/preferred-gpe-versions-2.8.inc - -# -# E -# - -include conf/distro/preferred-e-versions.inc |