summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-01-31 08:27:34 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-01-31 08:27:34 +0000
commit7a2c81bf198b4bcd8f344a1ef72734d1d605bba9 (patch)
treee5120d1222b1c2789a442f515dcf061d4f2c5c52 /conf
parentf53c4a0cfc709f29c5251ea374fc74fb1ef75ac2 (diff)
parenta24ac638a631ddd5722cad0e4bbf30084664c709 (diff)
merge of d95a77faa4899185141ccf69126722bbf2116c19
and e063b9788ae00fbebf2d7ae07cf7f7fc2feb45e9
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/generic.conf5
-rw-r--r--conf/distro/include/sane-srcdates.inc2
2 files changed, 6 insertions, 1 deletions
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 27c0437cf5..dbe68f24a4 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -53,10 +53,13 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
TARGET_OS = "linux"
TARGET_FPU_arm = "soft"
TARGET_FPU_armeb = "soft"
+
PREFERRED_PROVIDER_virtual/libiconv = "glibc"
PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
PREFERRED_VERSION_glibc ?= "2.5"
PREFERRED_VERSION_glibc-intermediate ?= "2.5"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 27e34856fd..53e187abf0 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -34,6 +34,8 @@ SRCDATE_matchbox-panel-manager ?= "20060612"
SRCDATE_matchbox-stroke ?= "20060612"
SRCDATE_matchbox-themes-extra ?= "20060612"
SRCDATE_matchbox-wm ?= "20060612"
+SRCDATE_libmatchbox ?= "20060612"
+SRCDATE_libfakekey ?= "20051101"
SRCDATE_psplash ?= "20061207"
SRCDATE_web ?= "20060613"
SRCDATE_zaurusd ?= "20060628"