diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-05 12:16:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-05 12:16:56 +0000 |
| commit | 3e846ba477aef514313450d4dba343e097be1418 (patch) | |
| tree | efc621e3b343883a8e4e79a63eb974257fe69707 /openembedded/conf/distro/familiar-0.8.3.conf | |
| parent | c49400dab0dbfd43842fcf6bdfc59937f4c0afe6 (diff) | |
| download | openembedded-core-3e846ba477aef514313450d4dba343e097be1418.tar.gz openembedded-core-3e846ba477aef514313450d4dba343e097be1418.tar.bz2 openembedded-core-3e846ba477aef514313450d4dba343e097be1418.zip | |
Updates against mainline openembedded + removal of some unneeded files
git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/distro/familiar-0.8.3.conf')
| -rw-r--r-- | openembedded/conf/distro/familiar-0.8.3.conf | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf index e26468cff3..475117ceba 100644 --- a/openembedded/conf/distro/familiar-0.8.3.conf +++ b/openembedded/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,13 +17,18 @@ 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 + +PREFERRED_VERSION_hostap-modules ?= "0.3.9 # 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" +PREFERRED_VERSION_gcc ?= "3.4.4" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" # # Opie @@ -41,12 +46,17 @@ include conf/distro/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -#PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_x11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.7.inc # # E # -include conf/distro/preferred-e-versions.inc + + +#23:57 < mickeyl> it's no longer necessary since our cleanup +#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it + +#include conf/distro/preferred-e-versions.inc |