merge of 43de53f09816b4e1e243912e5958a66424c605f8

     and ae090523c163ff0d1e234b0d89d1450a2466b4b4

6 files changed, 21 insertions, 6 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 327d4123cc..f3ad52beca 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -14,8 +14,6 @@ require conf/distro/include/sane-srcdates.inc
 
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
-#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
-
 
 FEED_URIS += " \
 		base##${ANGSTROM_URI}/unstable/feed/base \
@@ -29,6 +27,9 @@ FEED_URIS += " \
 
 #SRCDATE = "20060630"
 #SRCDATE_handhelds-pxa-2.6 = "20060622"
+PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5"
+
+
 SRCDATE_gconf-dbus = "20060719"
 SRCDATE_gnome-vfs-dbus = "20060803"
 
@@ -52,6 +53,8 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 
 PREFERRED_VERSION_fontconfig = "2.3.95"
 PREFERRED_VERSION_freetype = "2.2.1"
+#fix screen corruption issues
+PREFERRED_VERSION_cairo = "1.2.2"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -59,7 +62,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
-PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
+PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 6ae4e9ddc3..8041ca8fb6 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -55,6 +55,12 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 require conf/distro/include/sane-srcdates.inc
+PREFERRED_VERSION_busybox ?= "1.00"
+
+#
+# GlibC
+#
+PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 
 #
 # Opie
@@ -72,6 +78,7 @@ require conf/distro/include/preferred-opie-versions.inc
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index d9209ad23c..96bc33ede3 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -35,7 +35,8 @@ BUILD_OPTIMIZATION = "-Os"
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
 #ARM EABI is softfloat by default, but let's make sure :)
-TARGET_FPU_arm = "soft"
+#make it overridable for platforms with FPU, like ep93xx or i.mx31
+TARGET_FPU_arm ?= "soft"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index fb06ca7f47..71690ac62f 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -8,10 +8,11 @@ TARGET_FPU ?= "soft"
 
 # 2.4 vs 2.6 is a distro decision.
 MODUTILS = "26"
-BOOTSTRAP_EXTRA_RDEPENDS += "udev"
 
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
+PREFERRED_PROVIDER_hotplug = "udev"
+
 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"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 0261a84d64..5c7440403b 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -6,6 +6,7 @@ TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "ipaqsa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
+PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42"
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
 BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
 
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index cf9e96ce19..fc17985233 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -5,6 +5,8 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv5te"
 
+HOTPLUG = "udev"
+
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
@@ -18,7 +20,7 @@ PREFERRED_VERSION_linux-omap1 = "2.6.x+git"
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 # PCMCIA Modules
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"