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

21 files changed, 272 insertions, 74 deletions

diff --git a/classes/chicken.bbclass b/classes/chicken.bbclass
new file mode 100644
index 0000000000..5ebe1ff462
--- /dev/null
+++ b/classes/chicken.bbclass
@@ -0,0 +1,11 @@
+def chicken_arch(bb, d):
+    import re
+    arch_pattern = re.compile('^i.*86$')
+    target_arch = d.getVar("TARGET_ARCH", 1)
+    if arch_pattern.match(target_arch):
+        return 'x86'
+    else:
+        return target_arch
+
+CHICKEN_ARCH = "${@chicken_arch(bb, d)}"
+    
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 4978421b63..f21c4d6545 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -20,9 +20,27 @@ cmake_do_configure() {
 
   cmake ${OECMAKE_SOURCEPATH} \
     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-    -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
+    -DCMAKE_FIND_ROOT_PATH:PATH=${STAGING_DIR_HOST} \
     ${EXTRA_OECMAKE} \
     -Wno-dev
 }
 
-EXPORT_FUNCTIONS do_configure
+cmake_do_compile()  {
+  if [ ${OECMAKE_BUILDPATH} ]
+  then
+     cd ${OECMAKE_BUILDPATH}
+  fi
+  
+  base_do_compile
+}
+
+cmake_do_install() {
+  if [ ${OECMAKE_BUILDPATH} ];
+  then
+     cd ${OECMAKE_BUILDPATH}
+  fi
+  
+  autotools_do_install
+}
+
+EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index d4c3baa9cf..900d9c7f0d 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -11,16 +11,19 @@ PE = "2"
 
 ARM_INSTRUCTION_SET = "arm"
 
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-# do NOT inherit pkgconfig here, see note in autotools_stage_all
 inherit autotools
 
+# evas-native looks at this var, so keep it
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
 do_configure_prepend() {
 	touch config.rpath
 }
 
-do_stage() {
-	autotools_stage_all
+do_install_prepend () {
+	for i in `find ${S}/ -name "*.pc" -type f` ; do \
+		sed -i -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' $i
+	done
 }
 
 # This construction is stupid, someone with more E knowledge should change it to =+ or something
diff --git a/classes/image.bbclass b/classes/image.bbclass
index ab580312bb..9dce609733 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -17,6 +17,9 @@ IMAGE_INITSCRIPTS ?= "initscripts"
 #
 IMAGE_LOGIN_MANAGER ?= "tinylogin"
 
+# set sane default for the SPLASH variable
+SPLASH ?= ""
+
 IMAGE_KEEPROOTFS ?= ""
 IMAGE_KEEPROOTFS[doc] = "Set to non-empty to keep ${IMAGE_ROOTFS} around after image creation."
 
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 495c3a53aa..804caf06ee 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -61,6 +61,7 @@ def package_qa_get_machine_dict():
                         "i486":       (   3,     0,    0,          True,          True),
                         "i586":       (   3,     0,    0,          True,          True),
                         "i686":       (   3,     0,    0,          True,          True),
+                        "mips":       (   8,     0,    0,          False,         True),
                         "mipsel":     (   8,     0,    0,          True,          True),
                         "avr32":      (6317,     0,    0,          False,         True),
 			"sh4":        (42,	 0,    0,          True,          True),
diff --git a/classes/java.bbclass b/classes/java.bbclass
index b68035c13e..d4cf5aa954 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -13,7 +13,7 @@ libdir_jni ?= ${libdir}/jni
 # JVM bundle location on target
 libdir_jvm ?= ${libdir}/jvm
 
-STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java
+STAGING_DATADIR_JAVA ?= ${STAGING_DIR_JAVA}
 STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni
 STAGING_LIBDIR_JVM ?= ${STAGING_LIBDIR}/jvm
 
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 637805e6e3..53ea252b0e 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -95,25 +95,34 @@ kernel_do_compile() {
 kernel_do_compile[depends] = "${INITRAMFS_TASK}"
 
 kernel_do_stage() {
-	ASMDIR=`readlink include/asm`
+	if [ -e include/asm ] ; then
+		# This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels
+		ASMDIR=`readlink include/asm`
 
-	mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR
-	cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
+		mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR
+		cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
+	fi
 	# Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm	
 	if [ -e arch/${ARCH}/include/asm/ ] ; then 
-		cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
+		if [ -e include/asm ] ; then
+			cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
+		fi
 		install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include
 		cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/	
 
 	# Check for arch/x86 on i386
 	elif [ -d arch/x86/include/asm/ ]; then
-		cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/
+		if [ -e include/asm ] ; then
+			cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/
+		fi
 		install -d ${STAGING_KERNEL_DIR}/arch/x86/include
 		cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/
 	fi
 
-	rm -f ${STAGING_KERNEL_DIR}/include/asm
-	ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm
+	if [ -e include/asm ] ; then
+		rm -f ${STAGING_KERNEL_DIR}/include/asm
+		ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm
+	fi
 
 	mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic
 	cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/
@@ -201,8 +210,12 @@ kernel_do_install() {
 kernel_do_configure() {
 	yes '' | oe_runmake oldconfig
 	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
-		cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" initramfs.cpio.gz
-	fi 
+		for img in cpio.gz cpio.lzo cpio.lzma; do
+		if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
+			cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
+		fi
+		done
+	fi
 }
 
 do_menuconfig() {
@@ -527,8 +540,8 @@ do_deploy() {
 	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 
-	if [ -d "${D}/lib" ]; then
-		fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib
+	if [ -d "${PKGD}/lib" ]; then
+		fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${PKGD} lib
 	fi
 
 	cd ${DEPLOY_DIR_IMAGE}
@@ -540,4 +553,4 @@ do_deploy() {
 do_deploy[dirs] = "${S}"
 do_deploy[depends] += "fakeroot-native:do_populate_staging"
 
-addtask deploy before do_package after do_install
+addtask deploy before do_build after do_package
diff --git a/classes/linux-kernel-base.bbclass b/classes/linux-kernel-base.bbclass
index b3e0fdad7a..510951a620 100644
--- a/classes/linux-kernel-base.bbclass
+++ b/classes/linux-kernel-base.bbclass
@@ -4,6 +4,9 @@ def get_kernelversion(p):
 
     fn = p + '/include/linux/utsrelease.h'
     if not os.path.isfile(fn):
+        # after 2.6.33-rc1
+        fn = p + '/include/generated/utsrelease.h'
+    if not os.path.isfile(fn):
         fn = p + '/include/linux/version.h'
 
     import re
diff --git a/classes/module_strip.bbclass b/classes/module_strip.bbclass
index 3316e20c80..2650f71d50 100644
--- a/classes/module_strip.bbclass
+++ b/classes/module_strip.bbclass
@@ -1,26 +1,20 @@
-#DEPENDS_append = " module-strip"
+PACKAGESTRIPFUNCS += "do_strip_modules"
 
 do_strip_modules () {
-	for p in ${PACKAGES}; do
-		if test -e ${WORKDIR}/install/$p/lib/modules; then
-			if [ "${KERNEL_MAJOR_VERSION}" == "2.6" ]; then
-				modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.ko`"
-			else
-				modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.o`"
-			fi
-			if [ -n "$modules" ]; then
-				for module in $modules ; do
-					if ! [ -d "$module"  ] ; then
-						${STRIP} -v -g $module
-					fi
-				done	
-#				NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules
-			fi
+	if test -e ${PKGD}/lib/modules; then
+		if [ "${KERNEL_MAJOR_VERSION}" == "2.6" ]; then
+			modules="`find ${PKGD}/lib/modules -name \*.ko`"
+		else
+			modules="`find ${PKGD}/lib/modules -name \*.o`"
 		fi
-	done
+		if [ -n "$modules" ]; then
+			for module in $modules ; do
+				if ! [ -d "$module"  ] ; then
+					${STRIP} -v -g $module
+				fi
+			done	
+		fi
+	fi
 }
 
-python do_package_append () {
-	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'):
-		bb.build.exec_func('do_strip_modules', d)
-}
+
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 96f9cf1a96..6698b61cfc 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -36,6 +36,8 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 
+STAGING_DIR_JAVA = "${STAGING_DATADIR_JAVA_NATIVE}"
+
 # Don't use site files for native builds
 export CONFIG_SITE = ""
 
diff --git a/classes/package.bbclass b/classes/package.bbclass
index bb81f33b29..062f782129 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -5,6 +5,12 @@
 PKGD    = "${WORKDIR}/package"
 PKGDEST = "${WORKDIR}/packages-split"
 
+PKGV	?= "${PV}"
+PKGR	?= "${PR}${DISTRO_PR}"
+
+EXTENDPKGEVER = "${@['','${PKGE\x7d:'][bb.data.getVar('PKGE',d,1) > 0]}"
+EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}"
+
 def legitimize_package_name(s):
 	"""
 	Make sure package names are legitimate strings
@@ -201,6 +207,26 @@ def runstrip(file, d):
 
     return 1
 
+PACKAGESTRIPFUNCS += "do_runstrip"
+python do_runstrip() {
+	import stat
+
+	dvar = bb.data.getVar('PKGD', d, True)
+	def isexec(path):
+		try:
+			s = os.stat(path)
+		except (os.error, AttributeError):
+			return 0
+		return (s[stat.ST_MODE] & stat.S_IEXEC)
+
+	for root, dirs, files in os.walk(dvar):
+		for f in files:
+			file = os.path.join(root, f)
+			if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
+				runstrip(file, d)
+}
+
+
 def write_package_md5sums (root, outfile, ignorepaths):
     # For each regular file under root, writes an md5sum to outfile.
     # With thanks to patch.bbclass.
@@ -334,11 +360,12 @@ python perform_packagecopy () {
 
 	# Start by package population by taking a copy of the installed 
 	# files to operate on
+	os.system('rm -rf %s/*' % (dvar))
 	os.system('cp -pPR %s/* %s/' % (dest, dvar))
 }
 
 python populate_packages () {
-	import glob, stat, errno, re,os
+	import glob, errno, re,os
 
 	workdir = bb.data.getVar('WORKDIR', d, True)
 	outdir = bb.data.getVar('DEPLOY_DIR', d, True)
@@ -349,13 +376,6 @@ python populate_packages () {
 	bb.mkdirhier(outdir)
 	os.chdir(dvar)
 
-	def isexec(path):
-		try:
-			s = os.stat(path)
-		except (os.error, AttributeError):
-			return 0
-		return (s[stat.ST_MODE] & stat.S_IEXEC)
-
 	# Sanity check PACKAGES for duplicates - should be moved to 
 	# sanity.bbclass once we have the infrastucture
 	package_list = []
@@ -368,12 +388,10 @@ python populate_packages () {
 		else:
 			package_list.append(pkg)
 
+
 	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, True) != '1'):
-		for root, dirs, files in os.walk(dvar):
-			for f in files:
-				file = os.path.join(root, f)
-				if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
-					runstrip(file, d)
+		for f in (bb.data.getVar('PACKAGESTRIPFUNCS', d, True) or '').split():
+			bb.build.exec_func(f, d)
 
 	pkgdest = bb.data.getVar('PKGDEST', d, True)
 	os.system('rm -rf %s' % pkgdest)
@@ -477,7 +495,7 @@ python populate_packages () {
 	for pkg in package_list:
 		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
 
-		remstr = "${PN} (= ${EXTENDPV})"
+		remstr = "${PN} (= ${EXTENDPKGV})"
 		if main_is_empty and remstr in rdepends:
 			rdepends.remove(remstr)
 		for l in dangling_links[pkg]:
@@ -539,6 +557,8 @@ python emit_pkgdata() {
 		write_if_exists(sf, pkg, 'PN')
 		write_if_exists(sf, pkg, 'PV')
 		write_if_exists(sf, pkg, 'PR')
+		write_if_exists(sf, pkg, 'PKGV')
+		write_if_exists(sf, pkg, 'PKGR')
 		write_if_exists(sf, pkg, 'DESCRIPTION')
 		write_if_exists(sf, pkg, 'RDEPENDS')
 		write_if_exists(sf, pkg, 'RPROVIDES')
@@ -599,9 +619,9 @@ python package_do_shlibs() {
 
 	workdir = bb.data.getVar('WORKDIR', d, True)
 
-	ver = bb.data.getVar('PV', d, True)
+	ver = bb.data.getVar('PKGV', d, True)
 	if not ver:
-		bb.error("PV not defined")
+		bb.error("PKGV not defined")
 		return
 
 	pkgdest = bb.data.getVar('PKGDEST', d, True)
@@ -629,7 +649,9 @@ python package_do_shlibs() {
 		needs_ldconfig = False
 		bb.debug(2, "calculating shlib provides for %s" % pkg)
 
-		pkgver = bb.data.getVar('PV_' + pkg, d, True)
+		pkgver = bb.data.getVar('PKGV_' + pkg, d, True)
+		if not pkgver:
+			pkgver = bb.data.getVar('PV_' + pkg, d, True)
 		if not pkgver:
 			pkgver = ver
 
diff --git a/classes/package_dbg.bbclass b/classes/package_dbg.bbclass
new file mode 100644
index 0000000000..39dceaf9b3
--- /dev/null
+++ b/classes/package_dbg.bbclass
@@ -0,0 +1,125 @@
+# package_dbg.bbclass: populate -dbg versions for each package in PACKAGES
+#
+# Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
+#
+# Released under the MIT license (see LICENSE.MIT for the terms)
+
+
+inherit package
+
+
+PACKAGE_DBG_DIRS = "${bindir} ${sbindir} \
+                    ${libexecdir} ${libdir} \
+                    ${base_bindir} ${base_sbindir} \
+                    ${base_libdir}"
+PACKAGE_DBG_DESC = "Debugging files for %s"
+PACKAGE_DBG_EXCLUDE = "${PN}-locale* ${PN}-doc ${PN}-dev *-dbg"
+
+
+def __find(dir):
+    """ Given a directory, recurses into that directory,
+    returning all files. """
+
+    from os import walk
+    from os.path import join
+
+    for root, dirs, files in walk(dir):
+        for file in files:
+            yield join(root, file)
+
+def __package_get_files(pkg, d):
+    """ Obtains a list of files to be included in a package.
+
+    Starting from the FILES_<pkg> variable, it expands any globs in the list,
+    which removes missing files, and traverses any directories in the list.
+
+    It does *not* remove files which are also in other packages, it's left
+    to the user's discretion whether to allow overlap. """
+
+    from glob import glob
+    from os.path import join, isdir, islink
+
+    installdir = d.getVar("D", True)
+    installdirlen = len(installdir)
+
+    files = (d.getVar("FILES_%s" % pkg, True) or "").split()
+    for globbed in (glob(join(installdir, file[1:])) for file in files):
+        for path in globbed:
+            if isdir(path) and not islink(path):
+                for file in __find(path):
+                    yield file[installdirlen:]
+            else:
+                yield path[installdirlen:]
+
+def add_dbg_packages(d):
+    from fnmatch import fnmatch
+
+    packages = d.getVar("PACKAGES", True).split()
+    excludes = d.getVar("PACKAGE_DBG_EXCLUDE", True).split()
+
+    for pkg in tuple(packages):
+        if any(fnmatch(pkg, excluded) for excluded in excludes):
+            continue
+
+        dbgpkg = "%s-dbg" % pkg
+        if not dbgpkg in packages:
+            packages.insert(0, dbgpkg)
+
+    d.setVar("PACKAGES", " ".join(packages))
+
+
+# Add the -dbg packages to PACKAGES
+python () {
+    from bb.data import inherits_class as inherits
+
+    # Task handles its own -dbg versions of its packages at the moment
+    if not inherits("task", d):
+        dynpkgs = d.getVar("PACKAGES_DYNAMIC", True).split()
+        dynpkgs += ["%s-dbg" % dyn for dyn in dynpkgs]
+        d.setVar("PACKAGES_DYNAMIC", " ".join(dynpkgs))
+
+        add_dbg_packages(d)
+}
+
+python populate_packages_prepend () {
+	from bb.data import inherits_class as inherits
+
+	if not inherits("task", d):
+		bb.build.exec_func("package_do_dbg", d)
+}
+
+# Populate the -dbg subpackage metadata
+python package_do_dbg() {
+    """ Populate the -dbg subpackage metadata. """
+
+    from os.path import join, basename, dirname
+
+    def setVar(key, val):
+        if d.getVar(key, val) is None:
+            d.setVar(key, val)
+
+    add_dbg_packages(d)
+    packages = d.getVar("PACKAGES", True).split()
+    desc = d.getVar("PACKAGE_DBG_DESC", True)
+    debug_dirs = d.getVar("PACKAGE_DBG_DIRS", True).split()
+
+    done = []
+    for pkgname in tuple(packages):
+        files = tuple(__package_get_files(pkgname, d))
+        dbg = [join(dirname(file), ".debug", basename(file))
+               for file in files
+               if not file in done and
+                  any(file.startswith(dir) for dir in debug_dirs)]
+        done.extend(files)
+
+        if dbg:
+            setVar("FILES_%s-dbg" % pkgname, " ".join(dbg))
+            setVar("DESCRIPTION_%s-dbg" % pkgname, desc % pkgname)
+            setVar("RDEPENDS_%s-dbg" % pkgname, pkgname)
+        else:
+            try:
+                packages.remove("%s-dbg" % pkgname)
+            except ValueError:
+                pass
+    d.setVar("PACKAGES", " ".join(packages))
+}
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 3582195393..420c892f10 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -208,9 +208,9 @@ python do_package_ipk () {
 		fields = []
 		pe = bb.data.getVar('PE', d, 1)
 		if pe and int(pe) > 0:
-			fields.append(["Version: %s:%s-%s%s\n", ['PE', 'PV', 'PR', 'DISTRO_PR']])
+			fields.append(["Version: %s:%s-%s\n", ['PE', 'PKGV', 'PKGR']])
 		else:
-			fields.append(["Version: %s-%s%s\n", ['PV', 'PR', 'DISTRO_PR']])
+			fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']])
 		fields.append(["Description: %s\n", ['DESCRIPTION']])
 		fields.append(["Section: %s\n", ['SECTION']])
 		fields.append(["Priority: %s\n", ['PRIORITY']])
diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass
index 9c9ae4ff0a..b905e170f4 100644
--- a/classes/package_tar.bbclass
+++ b/classes/package_tar.bbclass
@@ -56,7 +56,8 @@ python do_package_tar () {
 
 	for pkg in packages.split():
 		localdata = bb.data.createCopy(d)
-		root = "%s/install/%s" % (workdir, pkg)
+		pkgdest = bb.data.getVar('PKGDEST', d, 1)
+		root = "%s/%s" % (pkgdest, pkg)
 
 		bb.data.setVar('ROOT', '', localdata)
 		bb.data.setVar('ROOT_%s' % pkg, root, localdata)
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index 1420089692..b4ee62c2a3 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -21,10 +21,6 @@ EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIB
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN} += " ${palmtopdir} "
-FILES_${PN}-dev += " ${palmtopdir}/plugins/*/lib*.so \
-                     ${palmtopdir}/plugins/*/*.la \
-                     ${palmtopdir}/plugins/*/*.a \
-                     ${palmtopdir}/plugins/*/*.o "
 FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
                      ${palmtopdir}/bin/.debug \
                      ${palmtopdir}/plugins/*/.debug "
diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index 5844461fb4..f3d93716d7 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -3,7 +3,7 @@ DEPENDS_prepend = "pkgconfig-native "
 do_install_prepend () {
 
 for i in `find ${S}/ -name "*.pc" -type f` ; do \
-            sed -i -e 's:-L${STAGING_LIBDIR}::g' $i
+            sed -i -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' $i
         done
 }
 
diff --git a/classes/qmake_base.bbclass b/classes/qmake_base.bbclass
index 50d8bb53da..4fbe21f2e1 100644
--- a/classes/qmake_base.bbclass
+++ b/classes/qmake_base.bbclass
@@ -13,6 +13,9 @@ export OE_QMAKE_AR="${AR}"
 export OE_QMAKE_STRIP="echo"
 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 
+# do not export STRIP to the environment
+STRIP[unexport] = "1"
+
 # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
 
 oe_qmake_mkspecs () {
diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass
index 35958b34ab..d3d4a14e8a 100644
--- a/classes/qt3e.bbclass
+++ b/classes/qt3e.bbclass
@@ -6,6 +6,6 @@ export QTEDIR="${STAGING_DIR_HOST}/qte3"
 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
-export OE_QMAKE_INCDIR_QT="${QTEDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib"
+export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
+export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
 export OE_QMAKE_LIBS_QT="qte"
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index aa2e2a174e..2d56b7e95b 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}"
+DEPENDS_prepend = "${@["qt4-x11-free ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}"
 
 inherit qmake2
 
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index f65df61c1d..f57d8e47d0 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -96,11 +96,14 @@ def check_sanity(e):
 			if not check_app_exists("qemu-arm", e.data):
 				messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
 
-		if os.path.exists("/proc/sys/vm/mmap_min_addr"):
-			f = file("/proc/sys/vm/mmap_min_addr", "r")
-			if (f.read().strip() != "0"):
-				messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
-			f.close()
+		try:
+			if os.path.exists("/proc/sys/vm/mmap_min_addr"):
+				f = file("/proc/sys/vm/mmap_min_addr", "r")
+				if (f.read().strip() != "0"):
+					messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
+				f.close()
+		except:
+			pass
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index b18313fa2a..db6329c4ad 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -9,7 +9,7 @@ LICENSE = "LGPLv2"
 DEPENDS += "startup-notification"
 
 XFCE_VERSION = ${PV}
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://www.us.xfce.org/archive/xfce/${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
 
 inherit autotools