8 files changed, 30 insertions, 18 deletions
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
index 1d40bbac56..ab367378af 100644
--- a/openembedded/conf/distro/familiar-unstable.conf
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -1,7 +1,6 @@
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
 DISTRO_VERSION = "unstable-${DATE}"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 # Do not touch this file before notifying familiar-dev@handhelds.org
 
 include conf/distro/familiar.conf
@@ -13,8 +12,12 @@ DISTRO_TYPE = "debug"
 
 
 FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
+    base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
+	${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \
+	locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \
+	locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \
+	locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de"
 
 #SRCDATE = 20050331
 #SRCDATE = "now"
@@ -25,7 +28,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 PREFERRED_PROVIDER_virtual/libiconv=glibc
 PREFERRED_PROVIDER_virtual/libintl=glibc
-PREFERRED_PROVIDER_x11=diet-x11
 
 PREFERRED_VERSION_hostap-modules ?= "0.3.9"
 
@@ -46,6 +48,12 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4"
 PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
 
 #
+# PIN the familiar build to a version
+#
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
+
+#
 # Opie
 #
 
@@ -61,7 +69,7 @@ PREFERRED_VERSION_qte = "2.3.10"
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
 
 include conf/distro/preferred-gpe-versions-2.8.inc
 
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar.conf
index 99e501589f..da5caa7998 100644
--- a/openembedded/conf/distro/familiar.conf
+++ b/openembedded/conf/distro/familiar.conf
@@ -2,14 +2,17 @@
 #@NAME: Familiar Linux
 #@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
 
+MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
+
 INHERIT += "package_ipk debian"
 TARGET_OS = "linux"
 
-PARALLEL_INSTALL_MODULES = "1"
-UDEV_DEVFS_RULES = "1"
+BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
 IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+PARALLEL_INSTALL_MODULES = "1"
+UDEV_DEVFS_RULES = "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')}"
 
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf
index f83e4b1d96..d30ecc9084 100644
--- a/openembedded/conf/distro/maemo-1.0.conf
+++ b/openembedded/conf/distro/maemo-1.0.conf
@@ -29,7 +29,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
 
 include conf/distro/preferred-gpe-versions.inc
 
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
index f424b16696..1143f1d940 100644
--- a/openembedded/conf/distro/openzaurus-unstable.conf
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -57,7 +57,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 # GPE
 #
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
 include conf/distro/preferred-gpe-versions-2.8.inc
 
 #
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index ab115ac292..d734b64cdd 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -55,7 +55,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDER_virtual/libiconv ?= glibc
 PREFERRED_PROVIDER_virtual/libintl ?= glibc
 PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
-PREFERRED_PROVIDER_x11 ?= "diet-x11"
+PREFERRED_PROVIDER_libx11 ?= "diet-x11"
 PREFERRED_PROVIDER_gconf ?= gconf-dbus
 PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
 
@@ -89,7 +89,7 @@ SRCDATE_matchbox-themes-extra ?= "20051101"
 SRCDATE_matchbox-wm ?= "20060120"
 SRCDATE_libmatchbox ?= "20060120"
 SRCDATE_tslib ?= "20051101"
-SRCDATE_xext ?= "20051101"
+SRCDATE_libxext ?= "20051101"
 SRCDATE_renderext ?= "20051101"
 SRCDATE_libxrender ?= "20051101"
 SRCDATE_fixesext ?= "20051101"
@@ -99,10 +99,10 @@ SRCDATE_xcalibrateext ?= "20051101"
 SRCDATE_recordext ?= "20051101"
 SRCDATE_libfakekey ?= "20051101"
 SRCDATE_xmodmap ?= "20051101"
-SRCDATE_xrandr ?= "20051101"
-SRCDATE_xtst ?= "20051101"
-SRCDATE_xcalibrate ?= "20051101"
-SRCDATE_xmu ?= "20051115"
+SRCDATE_libxrandr ?= "20051101"
+SRCDATE_libxtst ?= "20051101"
+SRCDATE_libxcalibrate ?= "20051101"
+SRCDATE_libxmu ?= "20051115"
 SRCDATE_xdpyinfo ?= "20051115"
 SRCDATE_xauth ?= "20060120"
 
diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf
index 320361398e..57ca4fe237 100644
--- a/openembedded/conf/documentation.conf
+++ b/openembedded/conf/documentation.conf
@@ -90,3 +90,4 @@ T[doc]       = "Temporary directory within the WORKDIR."
 GROUP_locale[doc] = "Locale generation of the GNU libc implementation"
 ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale"
 
+PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)."
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 3d6b7c0c3d..41c485c019 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -2,7 +2,7 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te nokia770"
+IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index e1cb468d8f..212da52587 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -7,7 +7,7 @@ KERNEL_VERSION ?= "2.6"
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk