conf/distro: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@652 311d38ba-8fff-0310-9ca6-ca027cbcb966

16 files changed, 211 insertions, 56 deletions

diff --git a/meta/conf/distro/angstrom-2006.9.conf b/meta/conf/distro/angstrom-2007.1.conf
index 5c1ed1296..327d4123c 100644
--- a/meta/conf/distro/angstrom-2006.9.conf
+++ b/meta/conf/distro/angstrom-2007.1.conf
@@ -9,7 +9,8 @@
 #DISTRO_VERSION = "2006.9"
 DISTRO_VERSION = "test-${DATE}"
 
-include conf/distro/angstrom.conf
+require conf/distro/include/angstrom.inc
+require conf/distro/include/sane-srcdates.inc
 
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
@@ -17,13 +18,21 @@ DISTRO_TYPE = "debug"
 
 
 FEED_URIS += " \
-		 base##${ANGSTROM_URI}/unstable/feed/base/"
+		base##${ANGSTROM_URI}/unstable/feed/base \
+		perl##${ANGSTROM_URI}/unstable/feed/perl \
+		python##${ANGSTROM_URI}/unstable/feed/python \
+		debug##${ANGSTROM_URI}/unstable/feed/debug \
+		${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}"
 #        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
-SRCDATE = "20060518"
-#SRCDATE_handhelds-pxa-2.6 = "20060516"
+#SRCDATE = "20060630"
+#SRCDATE_handhelds-pxa-2.6 = "20060622"
+SRCDATE_gconf-dbus = "20060719"
+SRCDATE_gnome-vfs-dbus = "20060803"
+
+PREFERRED_VERSION_qemu-native = "0.8.2"
 
 CVS_TARBALL_STASH = "\
 http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
@@ -34,34 +43,63 @@ http://www.oesources.org/source/current/"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
 QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.2"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 # GPE
-include conf/distro/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+
+PREFERRED_VERSION_fontconfig = "2.3.95"
+PREFERRED_VERSION_freetype = "2.2.1"
+
+#Small machines prefer kdrive, but we might ship full Xorg in other images
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+
+PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
 
-# E
-include conf/distro/preferred-e-versions.inc
-
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
 
+# E
+require conf/distro/include/preferred-e-versions.inc
 
 #Make sure we use 2.6 on machines with a 2.4/2.6 selector
 KERNEL = "kernel26"
-ZKERNEL_VERSION = "2.6"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
 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"
+# Libc/uclibc:
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libiconv ?= glibc
+PREFERRED_PROVIDER_virtual/libintl ?= glibc
+
+# Virtuals:
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
+
+# Others:
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_gconf ?= gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs
+PREFERRED_PROVIDER_tslib ?= tslib
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_ntp = "ntp"
+PREFERRED_PROVIDER_hotplug = "udev"
+PREFERRED_PROVIDER_libxss = "libxss"
 
 #EABI stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
@@ -70,8 +108,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 PREFERRED_VERSION_gcc ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.16.91.0.7"
-PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
+PREFERRED_VERSION_binutils ?= "2.17"
+PREFERRED_VERSION_binutils-cross ?= "2.17"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
 PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
@@ -83,9 +121,12 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
 
 
+# Busybox <1.1.0 doesn't have EABI support
+PREFERRED_VERSION_busybox = "1.2.1"
+
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-PREFERRED_VERSION_dbus ?= "0.61"
+PREFERRED_VERSION_dbus ?= "0.92"
 PREFERRED_VERSION_gstreamer ?= "0.10.6"
 
 PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
@@ -101,18 +142,27 @@ PREFERRED_VERSION_hostap-modules ?= "0.4.7"
 PCMCIA_MANAGER_c7x0 = "pcmciautils"
 PCMCIA_MANAGER_akita = "pcmciautils"
 PCMCIA_MANAGER_spitz = "pcmciautils"
+PCMCIA_MANAGER_tosa = "pcmciautils"
+PCMCIA_MANAGER_poodle = "pcmciautils"
 PCMCIA_MANAGER_nokia770 = "pcmciautils"
 PCMCIA_MANAGER_h2200 = "pcmciautils"
+PCMCIA_MANAGER_h4000 = "pcmciautils"
 PCMCIA_MANAGER_h6300 = "pcmciautils"
 PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
 
+# add altboot to compatible models, will be replaced with angstrom-bootmanager
+#EXTRA_STUFF_append_c7x0 = "altboot"
+#EXTRA_STUFF_append_akita = "altboot"
+#EXTRA_STUFF_append_spitz = "altboot"
+#EXTRA_STUFF_append_poodle = "altboot"
+#EXTRA_STUFF_append_tosa = "altboot"
 
-
-#### GPE section ###
+### GPE section ###
 
 #Install libgtkinput in devices without a keyboard
 GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
 GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
+GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput"
 GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput"
 GPE_EXTRA_INSTALL_append_simpad =  " libgtkinput" 
 GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
diff --git a/meta/conf/distro/familiar-unstable.conf b/meta/conf/distro/familiar-unstable.conf
index e42456672..6ae4e9ddc 100644
--- a/meta/conf/distro/familiar-unstable.conf
+++ b/meta/conf/distro/familiar-unstable.conf
@@ -1,15 +1,13 @@
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
 DISTRO_VERSION = "unstable-${DATE}"
-# Do not touch this file before notifying familiar-dev@handhelds.org
 
-include conf/distro/familiar.conf
+require conf/distro/include/familiar.inc
 
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
 
-
 FEED_URIS += " \
     base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
 	${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \
@@ -25,8 +23,8 @@ 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_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
 PREFERRED_VERSION_hostap-modules ?= "0.3.9"
 
@@ -37,7 +35,6 @@ PREFERRED_VERSION_orinoco-modules ?= "0.13e"
 PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
 PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
 
-
 # The CSL compiler is unusable because
 # 1) certain programs stop to compile
 # 2) more programs segfault
@@ -51,6 +48,14 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
 PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 
+
+#
+# Base
+#
+PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+
 #
 # Opie
 #
@@ -58,7 +63,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 OPIE_VERSION = "1.2.2"
 QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # GPE
@@ -66,12 +71,11 @@ include conf/distro/preferred-opie-versions.inc
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-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
 
diff --git a/meta/conf/distro/angstrom.conf b/meta/conf/distro/include/angstrom.inc
index 100017410..7e765bd92 100644
--- a/meta/conf/distro/angstrom.conf
+++ b/meta/conf/distro/include/angstrom.inc
@@ -6,35 +6,38 @@ DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
 #Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://www.angstrom-distribution.org/"
+ANGSTROM_URI = "http://www.angstrom-distribution.org"
 
 #Set the default maintainer to angstrom-dev
-MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
+MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>"
 
 #use ipkg package format with debian style naming
 #use multimachine buildrules 
 INHERIT += "package_ipk debian multimachine"
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
-PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
-ENABLE_BINARY_LOCALE_GENERATION ?= ""
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 
 
 #Use the ARM EABI when building for an ARM cpu. We can't use overrides
 #here because this breaks all places where ":=" is used.
-TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+#if you want to build using uclibc, specify "-uclibcgnueabi"
+TARGET_VENDOR = "-angstrom"
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+#uclibc (needs gcc 4.1.1 or newer)
+#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
 BUILD_OPTIMIZATION = "-Os"
+CXXFLAGS += "-fvisibility-inlines-hidden"
 
 #ARM EABI is softfloat by default, but let's make sure :)
 TARGET_FPU_arm = "soft"
 
 #Always ship these packages
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
 BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
 
 #Name the generated images in a sane way
diff --git a/meta/conf/distro/familiar.conf b/meta/conf/distro/include/familar.inc
index 2646fe78a..2646fe78a 100644
--- a/meta/conf/distro/familiar.conf
+++ b/meta/conf/distro/include/familar.inc
diff --git a/meta/conf/distro/maemo-preferred.inc b/meta/conf/distro/include/maemo-preferred.inc
index 943f24432..943f24432 100644
--- a/meta/conf/distro/maemo-preferred.inc
+++ b/meta/conf/distro/include/maemo-preferred.inc
diff --git a/meta/conf/distro/openzaurus.conf b/meta/conf/distro/include/openzaurus.inc
index b7f456320..264cceecf 100644
--- a/meta/conf/distro/openzaurus.conf
+++ b/meta/conf/distro/include/openzaurus.inc
@@ -16,3 +16,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
 PARALLEL_INSTALL_MODULES = "1"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# Set minimal version of BitBake needed
+BB_MIN_VERSION = "1.4.4"
+INHERIT += "sanity"
diff --git a/meta/conf/distro/poky-eabi.conf b/meta/conf/distro/include/poky-eabi.inc
index d35ec8e44..d35ec8e44 100644
--- a/meta/conf/distro/poky-eabi.conf
+++ b/meta/conf/distro/include/poky-eabi.inc
diff --git a/meta/conf/distro/poky-eabi2.conf b/meta/conf/distro/include/poky-eabi2.inc
index 2833f3090..2833f3090 100644
--- a/meta/conf/distro/poky-eabi2.conf
+++ b/meta/conf/distro/include/poky-eabi2.inc
diff --git a/meta/conf/distro/poky-oabi.conf b/meta/conf/distro/include/poky-oabi.inc
index 71d609201..71d609201 100644
--- a/meta/conf/distro/poky-oabi.conf
+++ b/meta/conf/distro/include/poky-oabi.inc
diff --git a/meta/conf/distro/preferred-e-versions.inc b/meta/conf/distro/include/preferred-e-versions.inc
index 607acad85..607acad85 100644
--- a/meta/conf/distro/preferred-e-versions.inc
+++ b/meta/conf/distro/include/preferred-e-versions.inc
diff --git a/meta/conf/distro/preferred-gpe-versions-2.7.inc b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc
index 933195977..36702025c 100644
--- a/meta/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -21,6 +21,7 @@ PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
 PREFERRED_VERSION_gtk+ ?= "2.6.10"
+PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.109"
@@ -37,6 +38,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.15"
+PREFERRED_PROVIDER_xextensions = "xextensions"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
 PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
 PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
diff --git a/meta/conf/distro/preferred-opie-versions.inc b/meta/conf/distro/include/preferred-opie-versions.inc
index 51c993762..34c1fd498 100644
--- a/meta/conf/distro/preferred-opie-versions.inc
+++ b/meta/conf/distro/include/preferred-opie-versions.inc
@@ -65,6 +65,7 @@ PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
@@ -203,4 +204,6 @@ PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
 PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/meta/conf/distro/include/sane-srcdates.inc b/meta/conf/distro/include/sane-srcdates.inc
new file mode 100644
index 000000000..0696ad190
--- /dev/null
+++ b/meta/conf/distro/include/sane-srcdates.inc
@@ -0,0 +1,85 @@
+# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version 
+
+# Kernel modules
+SRCDATE_at76c503a-modules ?= "20060814"
+SRCDATE_prism54-module ?= "20060814"
+
+# X11 libs, extentions and protos
+SRCDATE_xcalibrate ?= "20060804"
+SRCDATE_compositeext ?= "20060814"
+SRCDATE_drm ?= "20060814"
+SRCDATE_drm-kernel ?= "20060814"
+SRCDATE_fixesext ?= "20060814"
+SRCDATE_libxext-native ?= "20060814"
+SRCDATE_libxss ?= "20060814"
+SRCDATE_recordext ?= "20060814"
+SRCDATE_renderext ?= "20060814"
+SRCDATE_xcalibrate ?= "20060814"
+SRCDATE_xcalibrateext ?= "20060814"
+SRCDATE_xxf86dgaext ?= "20060814"
+SRCDATE_xxf86vmext ?= "20060814" 
+
+# Matchbox / O-hand
+SRCDATE_contacts ?= "20060707"
+SRCDATE_dates ?= "20060707"
+SRCDATE_web ?= "20060613"
+SRCDATE_eds-dbus ?= "20060707"
+SRCDATE_matchbox-common ?= "20060612"
+SRCDATE_matchbox-config-gtk ?= "20060612"
+SRCDATE_matchbox-desktop ?= "20060612"
+SRCDATE_matchbox-keyboard ?= "20060612"
+SRCDATE_matchbox-panel ?= "20060612"
+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_zaurusd ?= "20060628"
+
+# GPE
+SRCDATE_dasher-gpe  ?= "20060814"
+SRCDATE_rosetta ?= "20060804"
+
+# GNOME
+SRCDATE_gconf-dbus ?= "20060719"
+SRCDATE_gnome-vfs-dbus ?= "20060119"
+SRCDATE_gtkhtml2 ?= "20060323"
+
+#Misc apps, sorted by alphabet
+SRCDATE_avetanabt ?= "20060814"
+SRCDATE_bl ?= "20060814"
+SRCDATE_dvbstream ?= "20060814"
+SRCDATE_dvbtraffic ?= "20060814"
+SRCDATE_dvbtune ?= "20060814"
+SRCDATE_fdclock ?= "20060814"
+SRCDATE_fltk ?= "20060814"
+SRCDATE_ipkg-link ?= "20050930"
+SRCDATE_ipkg-link-1 ?= "20050930"
+SRCDATE_ipkg-utils ?= "20050930"
+SRCDATE_ipkg-utils-native ?= "20050930"
+SRCDATE_kaffe-qt ?= "20060814"
+SRCDATE_kbdd ?= "20060814"
+SRCDATE_led ?= "20060814"
+SRCDATE_linux-input ?= "20060814"
+SRCDATE_madwifi-modules ?= "20060814"
+SRCDATE_mileage ?= "20060814"
+SRCDATE_minimo ?= "20050401"
+SRCDATE_mystun-server ?= "20060814"
+SRCDATE_olsrd ?= "20060814"
+SRCDATE_opencvs ?= "20060814"
+SRCDATE_oprofile ?= "20060214"
+SRCDATE_portaudio ?= "20060814"
+SRCDATE_putty ?= "20060814"
+SRCDATE_python-cairo ?= "20060814"
+SRCDATE_qemu-native ?= "20060723"
+SRCDATE_roadster ?= "20060814"
+SRCDATE_sctzap ?= "20060814"
+SRCDATE_tslib ?= "20051101"
+SRCDATE_waimea ?= "20060814"
+SRCDATE_xcompmgr ?= "20060814"
+SRCDATE_xirssi ?= "20060814"
+SRCDATE_xsvg ?= "20060814"
+SRCDATE_yamonenv ?= "20060814"
+SRCDATE_zroadmap ?= "20060814"
+
diff --git a/meta/conf/distro/maemo-1.0.conf b/meta/conf/distro/maemo-1.0.conf
index d30ecc908..b8592fdf6 100644
--- a/meta/conf/distro/maemo-1.0.conf
+++ b/meta/conf/distro/maemo-1.0.conf
@@ -1,4 +1,4 @@
-include conf/distro/familiar.conf
+require conf/distro/include/familiar.inc
 
 DISTRO = "maemo"
 DISTRO_NAME = "Maemo Linux"
@@ -8,9 +8,7 @@ DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 
 FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
-
+		"
 #SRCDATE = 20050331
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -29,12 +27,12 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
 
-include conf/distro/preferred-gpe-versions.inc
+require conf/distro/include/preferred-gpe-versions.inc
 
 #
 # Maemo
 #
 
-include conf/distro/maemo-preferred.inc
+require conf/distro/include/maemo-preferred.inc
diff --git a/meta/conf/distro/openzaurus-unstable.conf b/meta/conf/distro/openzaurus-unstable.conf
index 9f79c3211..43492944f 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
 
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index f461c5619..c32631471 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -37,7 +37,7 @@ KERNEL_CONSOLE = "ttyS0"
 
 POKYMODE ?= "oabi"
 
-include conf/distro/poky-${POKYMODE}.conf
+require conf/distro/include/poky-${POKYMODE}.inc
 
 #
 # Preferred providers: