1 files changed, 17 insertions, 11 deletions

diff --git a/meta/conf/distro/openzaurus-unstable.conf b/meta/conf/distro/openzaurus-unstable.conf
index 9f79c32118..43492944ff 100644
--- a/meta/conf/distro/openzaurus-unstable.conf
+++ b/meta/conf/distro/openzaurus-unstable.conf
@@ -11,7 +11,8 @@ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/s
 http://www.oesources.org/source/current/"
 
 
-include conf/distro/openzaurus.conf
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/openzaurus.inc
 
 DISTRO_TYPE = "debug"
 # DISTRO_TYPE = "release"
@@ -25,20 +26,22 @@ DISTRO_TYPE = "debug"
 #            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
 #              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
-SRCDATE = "20060514"
+SRCDATE ?= "20060701"
+
 #
 # Zaurus
 #
-
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+PREFERRED_PROVIDER_tslib ?= tslib
 
 KERNEL_CONSOLE = "ttyS0"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
 
-# fix some iconv issues, needs to be adjusted when doing uclibc builds
+# Glibc provides iconv and intl -- adjust, when doing uclibc builds
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
@@ -49,23 +52,26 @@ 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_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
+
 #
 # Opie
 #
-#QTE_VERSION = "2.3.10"
-#OPIE_VERSION = "1.2.2"
-#PALMTOP_USE_MULTITHREADED_QT = "yes"
-include conf/distro/preferred-opie-versions.inc
+QTE_VERSION = "2.3.10"
+OPIE_VERSION = "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # GPE
 #
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
-include conf/distro/preferred-gpe-versions-2.8.inc
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #
 # E
 #
-include conf/distro/preferred-e-versions.inc
+require conf/distro/include/preferred-e-versions.inc