Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

125 files changed, 4656 insertions, 7562 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 34eb54d352..2447434e85 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -145,12 +145,12 @@ Interests:  wifi, kernels, emulation, qemu, git
 Recipes:    linux-jlime*, scummvm, blackbox
 
 Person:     Leon Woestenberg
-Mail:       leonw@mailcan.com
+Mail:       leon@sidebranch.com
 Website:    http://www.sidebranch.com/
-Interests:  Real-time embedded Linux for highly available applications.
+Interests:  Real-time and/or embedded Linux for industrial applications.
 Interests:  Small read-only Linux based firmware, deterministic builds.
-Recipes:    lighttpd, fastcgi
-Machines:   mpc8313e-rdb, efika, ixp4xxbe, x86, davinci-dvevm
+Recipes:    lighttpd, fastcgi, squashfs-tools, rt-tests, linux-rt, linux
+Machines:   mpc8313e-rdb, mpc8315e-rdb, efika, ixp4xxbe, x86, canyonlands
 
 Person:	    Liam Girdwoord
 Mail:       liam.girdwood@wolfsonmicro.com
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 20f371a987..e43b289c56 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -231,6 +231,10 @@ autotools_stage_all() {
 			echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
 			cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
 		fi
+		if [ -e ${STAGE_TEMP}/${datadir}/pkgconfig/ ] ; then
+			echo "cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/"
+			cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/
+		fi
 	fi
 	rm -rf ${STAGE_TEMP}/${mandir} || true
 	rm -rf ${STAGE_TEMP}/${infodir} || true
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 9ec705bc1e..e5fd814b25 100644
--- a/