merge of '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'

     and '350557edbea2aa55107ce4c0e4dffc849b7e2307'

11 files changed, 37 insertions, 42 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 327d4123cc..876975b875 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 = ""
@@ -90,9 +93,10 @@ 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_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_tslib-conf ?= "tslib"
 PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
 PREFERRED_PROVIDER_ntp = "ntp"
 PREFERRED_PROVIDER_hotplug = "udev"
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 5ff9e1c942..7d125ae25b 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -9,7 +9,7 @@ DISTRO_NAME = "Angstrom"
 ANGSTROM_URI = "http://www.angstrom-distribution.org"
 
 #Set the default maintainer to angstrom-dev
-MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>"
+MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
 
 #use ipkg package format with debian style naming
 #use multimachine buildrules 
@@ -35,10 +35,8 @@ 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_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
+#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}"
@@ -48,4 +46,4 @@ DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
 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')}"
 
 # We want images supporting the following features (for task-base)
-DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/familiar.inc b/conf/distro/include/familiar.inc
index c7f2a05177..ea360f5dc5 100644
--- a/conf/distro/include/familiar.inc
+++ b/conf/distro/include/familiar.inc
@@ -17,4 +17,4 @@ 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')}"
 
 # We want images supporting the following features (for task-base)
-DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/maemo-preferred.inc b/conf/distro/include/maemo-preferred.inc
index 943f244326..3b31837911 100644
--- a/conf/distro/include/maemo-preferred.inc
+++ b/conf/distro/include/maemo-preferred.inc
@@ -5,6 +5,6 @@ PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
 PREFERRED_PROVIDER_esd = "osso-esd"
 PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
 PREFERRED_VERSION_glib-2.0 = "2.6.4"
-PREFERRED_VERSION_pango = "1.8.1"
+PREFERRED_VERSION_pango = "1.8.2"
 PREFERRED_VERSION_atk = "1.9.0"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
\ No newline at end of file
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc
index 01877956ed..ea408ff221 100644
--- a/conf/distro/include/openzaurus.inc
+++ b/conf/distro/include/openzaurus.inc
@@ -22,4 +22,4 @@ BB_MIN_VERSION = "1.4.4"
 INHERIT += "sanity"
 
 # We want images supporting the following features (for task-base)
-DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
index 3bbc6be01a..256bc0103f 100644
--- a/conf/distro/include/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.6.inc
@@ -19,6 +19,7 @@ PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
 PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_pango ?= "1.8.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.3"
 PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.97"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 36702025c1..56d9c5b059 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -20,9 +20,9 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_pango ?= "1.8.2"
 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"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 180ca47b17..e78888a02c 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -17,6 +17,7 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 #PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 #PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 #PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+#PREFERRED_VERSION_pango ?= "1.8.2"
 #PREFERRED_VERSION_gtk+ ?= "2.6.3"
 #PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 #PREFERRED_VERSION_libgpewidget ?= "0.97"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index e668c3ce38..76e68fcc08 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -53,19 +53,13 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
 PREFERRED_VERSION_glibc = "2.4"
 PREFERRED_VERSION_glibc-intermediate = "2.4"
 
-
-#<>------------------------------------------------------------------>
-#<>Setting Preferred glib, dbus, db-native
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_glib-2.0-native = "2.6.5"
-PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.12.0"
-PREFERRED_VERSION_glib-1.2 = "1.2.10"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_dbus = "0.61"
-PREFERRED_VERSION_dbus-native = "0.61"
-PREFERRED_PROVIDER_dbus-glib = "dbus"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
+#<>----------------------------------------------------------------->
+#<>Patch for bitbake bug:
+#<>Due to bitbake not grabbing glibc 2.4  properly 
+#<>we need to override it to be sure. Do it for both supported archs
+#<>-----------------------------------------------------------------<
+PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
 
 #<>------------------------------------------------------------------>
@@ -110,17 +104,6 @@ require conf/distro/include/preferred-opie-versions.inc
 
 
 #<>------------------------------------------------------------------>
-#<> Lets decide on a GPE versipns
-#<> And lets override GTK to something that builds
-#<>------------------------------------------------------------------<
-require conf/distro/include/preferred-gpe-versions-2.7.inc
-PREFERRED_VERSION_gtk+ = "2.8.16"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_cairo = "1.2.2"
-PREFERRED_VERSION_gtk-engines = "2.7.4"
-
-
-#<>------------------------------------------------------------------>
 #<> We want pcmciautils, not pcmcia-cs
 #<>------------------------------------------------------------------<
 PCMCIA_MANAGER = "pcmciautils"
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"