merge of '65fcc53beb3d65343762ba2dce11a497216af44c'

     and 'f81643eda3b84834595762e576e7135f0101ce23'

95 files changed, 921 insertions, 1439 deletions

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 3c555751da..fccf2b6d80 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -139,6 +139,13 @@ autotools_do_configure() {
 
 autotools_do_install() {
 	oe_runmake 'DESTDIR=${D}' install
+
+        for i in `find ${D} -name "*.la"` ; do \
+            sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
+            sed -i -e s:${D}::g $i
+            sed -i -e 's:-I${WORKDIR}\S*: :g' $i
+            sed -i -e 's:-L${WORKDIR}\S*: :g' $i
+	done
 }
 
 STAGE_TEMP="${WORKDIR}/temp-staging"
diff --git a/classes/magicbox-image.bbclass b/classes/magicbox-image.bbclass
index 05de28b76b..c75e69cac2 100644
--- a/classes/magicbox-image.bbclass
+++ b/classes/magicbox-image.bbclass
@@ -1,6 +1,6 @@
 magicbox_gen_images() {
         # find latest kernel
-        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -n 1`
         if [ -z "$KERNEL" ]; then
                 oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Exiting !"
                 exit 1
diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index f2054b0b07..cd6e04731e 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -17,8 +17,17 @@ def get_pkgconfig_mangle(d):
 		s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
 		s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
 		s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+		s += " -e 's:-L${WORKDIR}\S*: :g'"
+		s += " -e 's:-I${WORKDIR}\S*: :g'"
+
 	return s
 
+do_install_append () {
+        for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
+                sed -i ${@get_pkgconfig_mangle(d)} ${pc}
+        done
+}
+
 do_stage_append () {
 	for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
 		pcname=`basename $pc`
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index d2fd4b0b04..a0da0667dd 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -89,7 +89,7 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-	required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
+	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 34a02514d3..e83ef90280 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -41,7 +41,9 @@ FEED_ARCH ?= "${TARGET_ARCH}"
 
 FEED_ARCH_ep93xx 	= "armv4t"
 FEED_ARCH_h6300		= "armv4t"
-FEED_ARCH_fic-gta01     = "armv4t"
+FEED_ARCH_fic-gta01	= "armv4t"
+FEED_ARCH_fic-gta02 = "armv4t"
+FEED_ARCH_fic-hxd8	= "armv4t"
 
 #armv5t machines
 
@@ -148,11 +150,11 @@ PREFERRED_VERSION_cairo            = "1.4.10"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.10.3"
-PREFERRED_VERSION_gtk+             = "2.10.12"
+PREFERRED_VERSION_gtk+             = "2.10.14"
 
 # newer poppler cvs breaks some apps, fix until popper 6 and apps
 # catch up with api changes
-PREFERRED_VERSION_poppler          = "0.5.4"
+# PREFERRED_VERSION_poppler          = "0.5.4"
 
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 6e33867aa9..1f46be09d6 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -1,9 +1,11 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: OpenMoKo
-#@DESCRIPTION: Linux Distribution Configuration for the FIC GTA01 Project
+#@NAME: OpenMoko
+#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
 #-----------------------------------------------------------------------------
 
+require conf/distro/angstrom-2007.1.conf
+
 #
 # Header
 #
@@ -11,18 +13,3 @@ DISTRO_NAME = "OpenMoKo"
 DISTRO_VERSION = ".dev-snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
-
-require conf/distro/include/openmoko.inc
-
-# Toolchain
-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.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
-# 2.5 has less bugs, but crashes dropbear :/
-PREFERRED_VERSION_glibc ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.4"
-
-PREFERRED_VERSION_lmsensors-apps ?= "2.10.1"
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
index 662fb54692..a4979d4527 100644
--- a/conf/machine/xilinx-ml403.conf
+++ b/conf/machine/xilinx-ml403.conf
@@ -1,7 +1,9 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: Xilinx ML403 FPGA Development Platform
-#@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform 
-\http://www.xilinx.com/xlnx/xebiz/designResources/ip_product_details.jsp?key=HW-V4-ML403-USA&iLanguageID=1
+#@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform \
+http://www.xilinx.com/ml403
 
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc405"
diff --git a/conf/machine/xilinx-ml410.conf b/conf/machine/xilinx-ml410.conf
new file mode 100644
index 0000000000..9adb26e43e
--- /dev/null
+++ b/