[oe-commits] org.oe.dev base.bbclass: Fix SRC_URI overrides handling, lower the priority of local file url checksum messages, correct populate_staging dependencies (from poky)

[rpurdie commit]

base.bbclass: Fix SRC_URI overrides handling, lower the priority of local file url checksum messages, correct populate_staging dependencies (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: b89d5fe7fb80d5f29e47adc74ca93a34eaa3f460
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b89d5fe7fb80d5f29e47adc74ca93a34eaa3f460
Files:
1
classes/base.bbclass
Diffs:

#
# mt diff -r56e0d68d9280c5824f92fc66b9e410bb8a5c60af -rb89d5fe7fb80d5f29e47adc74ca93a34eaa3f460
#
# 
# 
# patch "classes/base.bbclass"
#  from [14a6946faa8339efe5e92a4643b930a954fcee1e]
#    to [372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041]
# 
============================================================
--- classes/base.bbclass	14a6946faa8339efe5e92a4643b930a954fcee1e
+++ classes/base.bbclass	372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041
@@ -482,8 +482,11 @@ python base_do_fetch() {
 		(type,host,path,_,_,_) = bb.decodeurl(url)
 		uri = "%s://%s%s" % (type,host,path)
 		try:
-		    if not base_chk_file(parser, pn, pv,uri, localpath, d):
-			    bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+			if not base_chk_file(parser, pn, pv,uri, localpath, d):
+				if type != "file":
+					bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+				else:
+					bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
 		except Exception:
 			raise bb.build.FuncFailed("Checksum of '%s' failed" % uri)
 }
@@ -681,7 +684,8 @@ do_populate_staging[dirs] = "${STAGING_D
 			     ${STAGING_DATADIR} \
 			     ${S} ${B}"
 
-addtask populate_staging after do_package_write
+# Could be compile but populate_staging and do_install shouldn't run at the same time
+addtask populate_staging after do_install
 
 python do_populate_staging () {
 	bb.build.exec_func('do_stage', d)
@@ -847,7 +851,6 @@ def base_after_parse(d):
 
     paths = []
     for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
-        paths.append(bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d))
         path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)
         if os.path.isdir(path):
             paths.append(path)