summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-08-11 17:41:05 +0000
committerMichael Lauer <mickey@vanille-media.de>2006-08-11 17:41:05 +0000
commit793088bf35cab68f4ad12a700f596359505d0ea5 (patch)
tree3ab8689943dc6a5ef8d88f4084d899545d74e992 /conf
parent796353d016d9f352d70a378c653e3c627014f5bb (diff)
parent9420a9848facf3f32f45610beed446d2426ae66d (diff)
merge of 8025b1031a3e4a5ddd61c6a7a3f4788138fa0264
and fa44dacbf0a1b7a188ab4126d217aafc5a1f48f8
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/jlime-donkey.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index fc432afecb..de0cee56fa 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -14,10 +14,9 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
#<>
#<> We will set CVS DATE when things are known to work.
#<>
-PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+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_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
#<> We want this so we can crosscompile the kernel using gcc 3.4.3
#<> Also, select version of modules (and kernel)
@@ -43,8 +42,8 @@ PREFERRED_VERSION_gcc = "4.1.1"
PREFERRED_VERSION_gcc-cross = "4.1.1"
PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_glibc-initial = "2.3.2"
+PREFERRED_VERSION_glibc = "2.4"
+PREFERRED_VERSION_glibc-intermediate = "2.4"
require conf/distro/include/preferred-xorg-versions-X11R7.1.inc