diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-02 11:50:50 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-02 11:50:50 +0000 |
| commit | a9c46e44d43524fc650df45dcbb1f5b89b628c0e (patch) | |
| tree | 2e5112332db5431ef177df6152ff35ea6a7c4d9f | |
| parent | 26a4b23220073343f03f789ef4c0ed0b4443d50c (diff) | |
| download | openembedded-core-a9c46e44d43524fc650df45dcbb1f5b89b628c0e.tar.gz openembedded-core-a9c46e44d43524fc650df45dcbb1f5b89b628c0e.tar.bz2 openembedded-core-a9c46e44d43524fc650df45dcbb1f5b89b628c0e.zip | |
base/utils.bbclass: Sync up overlapping functions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/classes/base.bbclass | 19 | ||||
| -rw-r--r-- | meta/classes/utils.bbclass | 3 |
2 files changed, 2 insertions, 20 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 2c71571b3f..4cb5732c79 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -103,18 +103,6 @@ DEPENDS_prepend="${@base_dep_prepend(d)} " DEPENDS_virtclass-native_prepend="${@base_dep_prepend(d)} " DEPENDS_virtclass-nativesdk_prepend="${@base_dep_prepend(d)} " - -def base_set_filespath(path, d): - filespath = [] - extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split() - path = extrapaths + path - # The ":" ensures we have an 'empty' override - overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" - for p in path: - for o in overrides.split(":"): - filespath.append(os.path.join(p, o)) - return ":".join(filespath) - FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}" # THISDIR only works properly with imediate expansion as it has to run # in the context of the location its used (:=) @@ -607,13 +595,6 @@ python () { bb.data.setVar('MULTIMACH_ARCH', multiarch, d) } -def check_app_exists(app, d): - from bb import which, data - - app = data.expand(app, d) - path = data.getVar('PATH', d, 1) - return len(which(path, app)) != 0 - def check_gcc3(data): gcc3_versions = 'gcc-3.4.6 gcc-3.4.7 gcc-3.4 gcc34 gcc-3.4.4 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index ae6fb0d719..02e803a702 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -386,8 +386,9 @@ def explode_deps(s): return bb.utils.explode_deps(s) def base_set_filespath(path, d): - bb.note("base_set_filespath usage is deprecated, %s should be fixed" % d.getVar("P", 1)) filespath = [] + extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split() + path = extrapaths + path # The ":" ensures we have an 'empty' override overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" for p in path: |