Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

5 files changed, 10 insertions, 7 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index d29ba4bfcf..89ee917d20 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -661,7 +661,7 @@ python base_do_fetch() {
 		bb.note("No conf/checksums.ini found, not checking checksums")
 		return
 	except:
-		bb.note("Creating the CheckSum parser failed")
+		bb.note("Creating the CheckSum parser failed: %s:%s" % (sys.exc_info()[0], sys.exc_info()[1]))
 		return
 
 	pv = bb.data.getVar('PV', d, True)
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index b5b7b8655b..4978421b63 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -1,7 +1,7 @@
 DEPENDS += " cmake-native "
 
 # We want the staging and installing functions from autotools
-inherit autotools
+inherit autotools_stage
 
 # Use in-tree builds by default but allow this to be changed
 # since some packages do not support them (e.g. llvm 2.5).
diff --git a/classes/e.bbclass b/classes/e.bbclass
index a6fa1d0d78..fca9aa0010 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -23,7 +23,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
 # This construction is stupid, someone with more E knowledge should change it to =+ or something
 # And it's in efl.bbclass as well....
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib ${PN}-static"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
 FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 22e664ce01..d4c3baa9cf 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -24,7 +24,7 @@ do_stage() {
 }
 
 # This construction is stupid, someone with more E knowledge should change it to =+ or something
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static"
 
 FILES_${PN} = "${libdir}/*.so.*"
 
@@ -40,13 +40,14 @@ FILES_${PN}-themes = "${datadir}/${PN}/themes \
 FILES_${PN}-dev   += "${bindir}/${PN}-config \
                       ${libdir}/pkgconfig/* \
                       ${libdir}/lib*.la \
-                      ${libdir}/lib*.a \
                       ${libdir}/*.so \
-                      ${libdir}/${PN}/*.a \
                       ${libdir}/${PN}/*.la \
-                      ${libdir}/${PN}/*/*.a \
                       ${libdir}/${PN}/*/*.la"
 
+FILES_${PN}-static += "${libdir}/${PN}/*.a \
+                       ${libdir}/${PN}/*/*.a \
+"
+
 FILES_${PN}-dbg +=   "${libdir}/${PN}/.debug \
                       ${libdir}/${PN}/*/.debug"
 
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index 26e813a036..37721898d6 100644
--- a/classes/qmake2.bbclass
+++ b/classes/qmake2.bbclass
@@ -19,3 +19,5 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4"
+export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4"