Misc fixes

index 533f53c..ccfcaba 100644
@@ -145,7 +145,7 @@ fakeroot do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}
 	mkdir -p ${DEPLOY_DIR_IMAGE}
 
-	cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
+	cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt || true
 
     # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by
     # the previous build

index 4f3e635..d09911c 100644
@@ -307,7 +307,7 @@ def process_changes(repopath, revision1, revision2 = 'HEAD', report_all = False)
                 if chg.path == chg2.path or os.path.dirname(chg.path) == chg2.path:
                     if chg2.fieldname in related_fields.get(chg.fieldname, []):
                         chg.related.append(chg2)
-                    elif chg.path.startswith('packages/') and chg2.fieldname in ['PE', 'PV', 'PR']:
+                    elif chg.path == chg2.path and chg.path.startswith('packages/') and chg2.fieldname in ['PE', 'PV', 'PR']:
                         chg.related.append(chg2)
 
     if report_all:

index 6c2d4e9..3a68d8d 100644
@@ -7,6 +7,7 @@
 # Copyright (C) 2007-2011 Koen Kooi <[email protected]>
 #
 
+BUILDHISTORY_FEATURES ?= "image package"
 BUILDHISTORY_DIR ?= "${TMPDIR}/buildhistory"
 BUILDHISTORY_DIR_IMAGE = "${BUILDHISTORY_DIR}/images/${MACHINE_ARCH}/${TCLIBC}/${IMAGE_BASENAME}"
 BUILDHISTORY_DIR_PACKAGE = "${BUILDHISTORY_DIR}/packages/${MULTIMACH_TARGET_SYS}/${PN}"

@@ -25,6 +26,9 @@ PACKAGEFUNCS += "buildhistory_emit_pkghistory"
 python buildhistory_emit_pkghistory() {
 	import re
 
+	if not "package" in (d.getVar('BUILDHISTORY_FEATURES', True) or "").split():
+		return 0
+
 	pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE', True)
 
 	class RecipeInfo:

@@ -269,6 +273,10 @@ buildhistory_get_image_installed() {
 	# Anything requiring the use of the packaging system should be done in here
 	# in case the packaging files are going to be removed for this image
 
+	if [ "${@base_contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then
+		return
+	fi
+
 	mkdir -p ${BUILDHISTORY_DIR_IMAGE}
 
 	# Get list of installed packages

@@ -317,6 +325,10 @@ buildhistory_get_image_installed() {
 }
 
 buildhistory_get_imageinfo() {
+	if [ "${@base_contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then
+		return
+	fi
+
 	# List the files in the image, but exclude date/time etc.
 	# This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo
 	( cd ${IMAGE_ROOTFS} && find . -ls | awk '{ if ( $7 ~ /[0-9]/ ) printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, $7, $11, $12, $13 ; else printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, 0, $10, $11, $12 }' | sort -k5 > ${BUILDHISTORY_DIR_IMAGE}/files-in-image.txt )

@@ -371,7 +383,7 @@ def buildhistory_get_imagevars(d):
 buildhistory_commit() {
 	if [ ! -d ${BUILDHISTORY_DIR} ] ; then
 		# Code above that creates this dir never executed, so there can't be anything to commit
-		exit
+		return
 	fi
 
 	( cd ${BUILDHISTORY_DIR}/

@@ -396,8 +408,9 @@ python buildhistory_eventhandler() {
 	import bb.event
 
 	if isinstance(e, bb.event.BuildCompleted):
-		if e.data.getVar("BUILDHISTORY_COMMIT", True) == "1":
-			bb.build.exec_func("buildhistory_commit", e.data)
+		if e.data.getVar('BUILDHISTORY_FEATURES', True).strip():
+			if e.data.getVar("BUILDHISTORY_COMMIT", True) == "1":
+				bb.build.exec_func("buildhistory_commit", e.data)
 }
 
 addhandler buildhistory_eventhandler

index 3a68d8d..f99aa7f 100644
@@ -19,6 +19,11 @@ BUILDHISTORY_PUSH_REPO ?= ""
 inherit package
 PACKAGEFUNCS += "buildhistory_emit_pkghistory"
 
+# We don't want to force a rerun of do_package for everything
+# if the buildhistory_emit_pkghistory function or any of the
+# variables it refers to changes
+do_package[vardepsexclude] += "buildhistory_emit_pkghistory"
+
 #
 # Called during do_package to write out metadata about this package
 # for comparision when writing future packages

index 6fc30a0..86847ef 100644
@@ -26,7 +26,7 @@ do_install () {
 # There are only .so files in iproute2
 INSANE_SKIP_${PN} = "dev-so"
 
-FILES_${PN} += "${base_libdir}/tc/*"
+FILES_${PN} += "${base_libdir}/tc"
 FILES_${PN}-dbg += "${base_libdir}/tc/.debug"
 
 ALTERNATIVE_NAME = "ip"

index 4391fb6..5af12af 100644
@@ -1,5 +1,7 @@
 require iproute2.inc
 
+PR = "r1"
+
 #v3.2.0 tag is "447c118f138171b260ad045ad6e1b17f9ef462e2"
 #but it was not fully tested and had build error, and the next commit fixed it.
 SRCREV = "13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0"

index 0e57e5a..8c15352 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r42"
+INC_PR = "r43"
 
 QT_BASE_LIB  ?= "libqt-embedded"
 

index e1bef64..072c522 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r40"
+INC_PR = "r41"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"

index 7f1f6f0..468a46f 100644
@@ -155,6 +155,9 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
 RRECOMMENDS_${QT_BASE_NAME}-doc += " \
             ${QT_BASE_NAME}-demos-doc"
 
+RPROVIDES_${QT_BASE_NAME}-tools += "qmake2"
+RREPLACES_${QT_BASE_NAME}-tools += "qmake2"
+
 FILES_${QT_BASE_NAME}-tools                = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
 FILES_${QT_BASE_NAME}-tools-dbg            = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
 FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"