diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-02-01 02:17:28 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-02-01 02:17:28 +0000 |
| commit | 4535a2191ae70715bf899c704e16bea65dd224cb (patch) | |
| tree | 904b4761adf2ec42c1dadfa65c9810658c598500 /conf | |
| parent | d01b8136f2e8d3daf120cea1962b9af487bd2335 (diff) | |
| parent | e0be045be38a9e4eaa9cc877b86b577deedcf367 (diff) | |
merge of '3113cfe3acb79d8bce9b167f4840c404f744c7a4'
and 'da7c8d017a4154208fc087bae975d8058f6c2e6f'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/generic.conf | 5 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 | ||||
| -rw-r--r-- | conf/machine/logicpd-pxa270.conf | 2 |
3 files changed, 7 insertions, 2 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" diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index dacee830b7..435014ac5c 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for LogicPD PXA270 Zoom Development Platform #OLDEST_KERNEL = "2.6.17-rc5" TARGET_ARCH = "arm" -PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5" +PREFERRED_VERSION_logicpd-pxa270 = "2.6.19.2" GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" |