Merge branch 'org.openembedded.dev' of new.openembedded.org:openembedded into org.openembedded.dev

11 files changed, 44 insertions, 27 deletions

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 1ea4b6f1d0..c53583b8b6 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -152,7 +152,9 @@ autotools_prepackage_lamangler () {
                 sed -i -e s:${CROSS_DIR}/${HOST_SYS}::g $i
                 sed -i -e s:${CROSS_DIR}::g $i
                 sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
-                sed -i -e s:${STAGING_DIR_HOST}::g $i
+                if [ -n "${STAGING_DIR_HOST}" ]; then
+                        sed -i -e s:${STAGING_DIR_HOST}::g $i
+                fi
                 sed -i -e s:${STAGING_DIR}::g $i
                 sed -i -e s:${S}::g $i
                 sed -i -e s:${T}::g $i
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 1de157c0f5..9a3d39cb49 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -2,6 +2,11 @@
 # no need for them to be a direct target of 'world'
 EXCLUDE_FROM_WORLD = "1"
 
+# In order to keep TARGET_PREFIX decoupled from TARGET_SYS, let's force the
+# binary names to match the former, rather than relying on autoconf's implicit
+# prefixing based on the latter.
+EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
+
 # Save PACKAGE_ARCH before changing HOST_ARCH
 OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
 PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}"
diff --git a/classes/e.bbclass b/classes/e.bbclass
index fca9aa0010..5db0749eef 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -10,12 +10,16 @@ ARM_INSTRUCTION_SET = "arm"
 inherit autotools pkgconfig binconfig
 
 do_prepsources () {
-  make clean distclean || true
+	make clean distclean || true
 }
 addtask prepsources after do_patch before do_configure
 
+do_configure_prepend() {
+	autopoint || touch config.rpath
+}
+
 do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }
 
 export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 805422fdf4..14334571ce 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -17,7 +17,7 @@ inherit autotools
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 do_configure_prepend() {
-	touch config.rpath
+	autopoint || touch config.rpath
 }
 
 do_install_prepend () {
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 804caf06ee..c2e8d9cf1d 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -279,7 +279,7 @@ def package_qa_check_dbg(path, name,d, elf):
     sane = True
 
     if not "-dbg" in name:
-        if '.debug' in path:
+        if '.debug' in path.split(os.path.sep):
             error_msg = "non debug package contains .debug directory: %s path %s" % \
                      (name, package_qa_clean_path(path,d))
             sane = package_qa_handle_error(3, error_msg, name, path, d)
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 39ff928e6a..3a52a067cc 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -127,16 +127,7 @@ kernel_do_stage() {
 	mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic
 	cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/
 
-	mkdir -p ${STAGING_KERNEL_DIR}/include/linux
-	cp -fR include/linux/* ${STAGING_KERNEL_DIR}/include/linux/
-
-	mkdir -p ${STAGING_KERNEL_DIR}/include/net
-	cp -fR include/net/* ${STAGING_KERNEL_DIR}/include/net/
-
-	mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia
-	cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/
-
-	for entry in drivers/crypto drivers/media include/media include/acpi include/sound include/video include/scsi include/trace; do
+	for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do
 		if [ -d $entry ]; then
 			mkdir -p ${STAGING_KERNEL_DIR}/$entry
 			cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/
@@ -497,7 +488,7 @@ python populate_packages_prepend () {
 # Support checking the kernel size since some kernels need to reside in partitions
 # with a fixed length or there is a limit in transferring the kernel to memory
 do_sizecheck() {
-	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then
+	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
         	size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
         	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
                 	rm ${KERNEL_OUTPUT}
diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass
index 080adc5d77..75f5790121 100644
--- a/classes/nativesdk.bbclass
+++ b/classes/nativesdk.bbclass
@@ -51,9 +51,12 @@ FILES_${PN}-dbg += "${prefix}/.debug \
 export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
 
+ORIG_DEPENDS := "${DEPENDS}"
+DEPENDS_virtclass-nativesdk ?= "${ORIG_DEPENDS}"
+
 python __anonymous () {
     pn = bb.data.getVar("PN", d, True)
-    depends = bb.data.getVar("DEPENDS", d, True)
+    depends = bb.data.getVar("DEPENDS_virtclass-nativesdk", d, True)
     deps = bb.utils.explode_deps(depends)
     newdeps = []
     for dep in deps:
@@ -65,7 +68,7 @@ python __anonymous () {
             newdeps.append(dep + "-nativesdk")
         else:
             newdeps.append(dep)
-    bb.data.setVar("DEPENDS", " ".join(newdeps), d)
+    bb.data.setVar("DEPENDS_virtclass-nativesdk", " ".join(newdeps), d)
     provides = bb.data.getVar("PROVIDES", d, True)
     for prov in provides.split():
         if prov.find(pn) != -1:
@@ -73,6 +76,7 @@ python __anonymous () {
         if not prov.endswith("-nativesdk"):
             provides = provides.replace(prov, prov + "-nativesdk")
     bb.data.setVar("PROVIDES", provides, d)
+    bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-nativesdk", d)
 }
 
 
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 062f782129..72c9053cc4 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -155,11 +155,12 @@ def runstrip(file, d):
     import commands, stat
 
     pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
+    magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) 
 
-    ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
+    ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file))
 
     if ret:
-        bb.error("runstrip: 'file %s' failed (forced strip)" % file)
+        bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file))
 
     if "not stripped" not in result:
         bb.debug(1, "runstrip: skip %s" % file)
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 16dd511fcb..38d6121529 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -7,7 +7,8 @@
 
 do_rootfs[depends] += "opkg-native:do_populate_staging"
 
-IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
+IPKG_TMP_DIR = "${IMAGE_ROOTFS}-tmp"
+IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} -t ${IPKG_TMP_DIR} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
 
 PACKAGE_INSTALL_NO_DEPS ?= "0"
 
@@ -31,6 +32,7 @@ fakeroot rootfs_ipk_do_rootfs () {
 	package_generate_ipkg_conf
 
 	mkdir -p ${T}
+	mkdir -p ${IPKG_TMP_DIR}
 	mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/
 
 	STATUS=${IMAGE_ROOTFS}${libdir}/opkg/status
@@ -100,6 +102,7 @@ fakeroot rootfs_ipk_do_rootfs () {
 	${ROOTFS_POSTPROCESS_COMMAND}
 	
 	log_check rootfs 	
+	rm -rf ${IPKG_TMP_DIR}
 }
 
 rootfs_ipk_log_check() {
diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass
index fc923c5112..e6c9c8e284 100644
--- a/classes/testlab.bbclass
+++ b/classes/testlab.bbclass
@@ -24,26 +24,31 @@
 do_testlab() {
 if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full" ] ; then
 
+	IPKG_TMP_DIR="${IMAGE_ROOTFS}-tmp"
+	IPKG_ARGS="-f ${STAGING_ETCDIR_NATIVE}/opkg.conf -o ${IMAGE_ROOTFS} -t ${IPKG_TMP_DIR}"
+
 	TESTLAB_DIR="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-testlab"
         mkdir -p ${TESTLAB_DIR}/
+        mkdir -p ${IPKG_TMP_DIR}/
 	ls -laR ${IMAGE_ROOTFS} > ${TESTLAB_DIR}/files-in-image.txt 	
      
 	echo > ${TESTLAB_DIR}/installed-packages.txt
 	echo -e "digraph depends {\n    node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
 
-	for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do 
-		opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}'  >> ${TESTLAB_DIR}/installed-packages.txt
+	for pkg in $(opkg-cl ${IPKG_ARGS} list_installed | awk '{print $1}') ; do 
+		opkg-cl ${IPKG_ARGS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}'  >> ${TESTLAB_DIR}/installed-packages.txt
 
-    		for depends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o  ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do 
+    		for depends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Depends) ; do 
         		echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
     		done
     		
-		for recommends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Recom) ; do
+		for recommends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Recom) ; do
         		echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v Recom | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
     		done
 	done
 
 	echo "}" >>  ${TESTLAB_DIR}/depends.dot
+	rm -rf ${IPKG_TMP_DIR}
 	
 	grep -v kernel_2 ${TESTLAB_DIR}/depends.dot | grep -v kernel_image > ${TESTLAB_DIR}/depends-nokernel.dot
 	grep -v libc6 ${TESTLAB_DIR}/depends-nokernel.dot | grep -v libgcc > ${TESTLAB_DIR}/depends-nokernel-nolibc.dot
diff --git a/classes/vala.bbclass b/classes/vala.bbclass
index 125820c00c..26339058c8 100644
--- a/classes/vala.bbclass
+++ b/classes/vala.bbclass
@@ -5,10 +5,12 @@ FILES_${PN}-dev += "\
   ${datadir}/vala/vapi/*.deps \
 "
 
+VALA_DONT_STAGE_VAPIS ?= "\(/config.vapi$\)\|\(/config.deps$\)"
+
 # .vapi and .deps files are arch independent and need to be present in the
 # staging datadir for the native vala compiler
 do_stage_append() {
 	install -d ${STAGING_DATADIR_NATIVE}/vala/vapi
-	find . -name "*.vapi" -exec install -m 0644 {} ${STAGING_DATADIR_NATIVE}/vala/vapi/ \;
-	find . -name "*.deps" -exec install -m 0644 {} ${STAGING_DATADIR_NATIVE}/vala/vapi/ \;
+	for VALAFILE in `find . -name "*.vapi" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
+	for VALAFILE in `find . -name "*.deps" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
 }