merge of '074f227db84b62ec3c531c61efcd62fc6b429dc3'

     and '5af64e0f29377b9ebbc655af469dd70d6a2f6dfb'

7 files changed, 23 insertions, 4 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 7526dff65e..2b508a8e84 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -848,6 +848,12 @@ def base_after_parse(d):
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
     
+    # Make sure TARGET_ARCH isn't exported
+    # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this 
+    # in them, undocumented)
+    bb.data.delVarFlag('TARGET_ARCH', 'export', d)
+    bb.data.setVarFlag('TARGET_ARCH', 'unexport', 1, d)
+    
     # Make sure DISTRO isn't exported
     # (breaks sysvinit at least)
     bb.data.delVarFlag('DISTRO', 'export', d)
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 67aeb33a13..37b9d83d97 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -694,6 +694,16 @@ python package_do_shlibs() {
 				for l in lines:
 					shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
 
+	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
+	if assumed_libs:
+	    for e in assumed_libs.split():
+		l, dep_pkg = e.split(":")
+		lib_ver = None
+		dep_pkg = dep_pkg.rsplit("_", 1)
+		if len(dep_pkg) == 2:
+		    lib_ver = dep_pkg[1]
+		dep_pkg = dep_pkg[0]
+		shlib_provider[l] = (dep_pkg, lib_ver)
 
 	for pkg in packages.split():
 		bb.debug(2, "calculating shlib requirements for %s" % pkg)
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 16d6050573..087bbcbfb4 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -323,4 +323,5 @@ python do_package_write_ipk () {
 	bb.build.exec_func("do_package_ipk", d)
 }
 do_package_write_ipk[dirs] = "${D}"
+do_package_write_ipk[depends] = "ipkg-utils-native:do_populate_staging"
 addtask package_write_ipk before do_package_write after do_package
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 479abce7fa..cc413b7011 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -70,8 +70,9 @@ def check_sanity(e):
 	if "diffstat-native" not in assume_provided:
 		messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
 	
-	# Check that the MACHINE is valid
-	if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+	# Check that the MACHINE is valid, if it is set
+	if data.getVar('MACHINE', e.data, True):
+	    if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
 		messages = messages + 'Please set a valid MACHINE in your local.conf\n'
 	
 	# Check that the DISTRO is valid
diff --git a/classes/scons.bbclass b/classes/scons.bbclass
index 534b3bd4c7..6d0a783dc2 100644
--- a/classes/scons.bbclass
+++ b/classes/scons.bbclass
@@ -6,6 +6,7 @@ scons_do_compile() {
 }
 
 scons_do_install() {
+	install -d ${D}${prefix}
         ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \
         oefatal "scons install execution failed."
 }
diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index 6f77f460dc..ae186bd04a 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -4,7 +4,7 @@
 
 # yes, python-sip is actually a build-time dependency, since
 # the recipe installs sip.h
-DEPENDS =+ "sip-native python-sip"
+DEPENDS += "sip-native python-sip"
 
 # default stuff, do not uncomment
 # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 390d3684d4..bbc9f187ec 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -106,6 +106,6 @@ EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
 addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after archive_bb before do_create_diff_gz
+addtask dumpdata after do_archive_bb before do_create_diff_gz
 addtask create_diff_gz after do_dump_data before do_configure