diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2007-09-01 15:30:38 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-09-01 15:30:38 +0000 |
| commit | cbd7193c0ca7157d04e0ad0ee9649998a9bb7527 (patch) | |
| tree | 650acc0f058b29ef4aaedadd2a00dcd35381aaa8 /classes | |
| parent | 956f5bb2c9a104582f87b5831a71bfad349cf2b0 (diff) | |
| download | openembedded-cbd7193c0ca7157d04e0ad0ee9649998a9bb7527.tar.gz | |
base.bbclass: Fix SRC_URI overrides handling, lower the priority of local file url checksum messages, correct populate_staging dependencies (from poky)
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 23ca444fe6..1a3739f383 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -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_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T ${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) |