Merge changes from mainline OE to try and keep us in sync.

git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966

7 files changed, 24 insertions, 6 deletions

diff --git a/openembedded/classes/autotools.bbclass b/openembedded/classes/autotools.bbclass
index ec1d4af1a4..8d448ce0d3 100644
--- a/openembedded/classes/autotools.bbclass
+++ b/openembedded/classes/autotools.bbclass
@@ -150,4 +150,16 @@ autotools_stage_includes() {
         fi
 }
 
+autotools_stage_all() {
+        if [ "${INHIBIT_AUTO_STAGE}" != "1" ]
+        then
+                rm -rf ${STAGE_TEMP}
+                mkdir -p ${STAGE_TEMP}
+                oe_runmake DESTDIR="${STAGE_TEMP}" install
+                cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+                cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+                rm -rf ${STAGE_TEMP}
+        fi
+}
+
 EXPORT_FUNCTIONS do_configure do_install
diff --git a/openembedded/classes/binconfig.bbclass b/openembedded/classes/binconfig.bbclass
index a599dec3f2..bf15ebcdf9 100644
--- a/openembedded/classes/binconfig.bbclass
+++ b/openembedded/classes/binconfig.bbclass
@@ -24,8 +24,10 @@ def is_native(d):
         import bb.data
         return ["","-native"][bb.data.inherits_class('native', d)]
 
+BINCONFIG_GLOB ?= "*-config"
+
 do_stage_append() {
-        for config in `find ${S} -name '*-config'`; do
+        for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
                 configname=`basename $config`${@is_native(d)}
                 install -d ${STAGING_BINDIR}
                 cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname
diff --git a/openembedded/classes/efl.bbclass b/openembedded/classes/efl.bbclass
index 16c2dba0b8..964748e85c 100644
--- a/openembedded/classes/efl.bbclass
+++ b/openembedded/classes/efl.bbclass
@@ -38,6 +38,10 @@ export ESMART_CONFIG		= "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
 export FREETYPE_CONFIG          = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
 export IMLIB2_CONFIG            = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
 
+do_compile_prepend() {
+        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
 do_stage_append () {
         for i in ${libraries}
         do
diff --git a/openembedded/classes/kernel.bbclass b/openembedded/classes/kernel.bbclass
index ff9aeeab78..df676c5a8d 100644
--- a/openembedded/classes/kernel.bbclass
+++ b/openembedded/classes/kernel.bbclass
@@ -60,7 +60,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 kernel_do_compile() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-        oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+        if ${KERNEL_MAJOR_VERSION} != "2.6"; then
+                oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+        fi
         oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
         if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                 oe_runmake modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
diff --git a/openembedded/classes/qt3x11.bbclass b/openembedded/classes/qt3x11.bbclass
index 1023a1f800..09b9cbac96 100644
--- a/openembedded/classes/qt3x11.bbclass
+++ b/openembedded/classes/qt3x11.bbclass
@@ -1,4 +1,3 @@
-DEPENDS += "qt3-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #
diff --git a/openembedded/classes/qt4x11.bbclass b/openembedded/classes/qt4x11.bbclass
index 92885aa7ee..d4ca0073df 100644
--- a/openembedded/classes/qt4x11.bbclass
+++ b/openembedded/classes/qt4x11.bbclass
@@ -1,4 +1,3 @@
-DEPENDS += "qt4-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #
diff --git a/openembedded/classes/sourcepkg.bbclass b/openembedded/classes/sourcepkg.bbclass
index 3eeff91333..390d3684d4 100644
--- a/openembedded/classes/sourcepkg.bbclass
+++ b/openembedded/classes/sourcepkg.bbclass
@@ -1,5 +1,5 @@
 DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source"
-EXCLUDE_FROM ?= ".pc"
+EXCLUDE_FROM ?= ".pc autom4te.cache"
 
 # used as part of a path. make sure it's set
 DISTRO ?= "openembedded"
@@ -42,7 +42,7 @@ sourcepkg_do_create_orig_tgz(){
         
         echo $src_tree
         oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
-        tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz  $src_tree --exclude-from temp/exclude-from-file
+        tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
         cp -pPR $src_tree $src_tree.orig
 }