1 files changed, 15 insertions, 11 deletions

diff --git a/meta/conf/distro/familiar-unstable.conf b/meta/conf/distro/familiar-unstable.conf
index e42456672c..6ae4e9ddc3 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