mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

base/utils.bbclass: Sync up overlapping functions

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-11-02 11:50:50 +00:00
parent 26a4b23220
commit a9c46e44d4
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/base.bbclass
-19
View File
@@ -103,18 +103,6 @@ DEPENDS_prepend="${@base_dep_prepend(d)} "
DEPENDS_virtclass-native_prepend="${@base_dep_prepend(d)} " DEPENDS_virtclass-native_prepend="${@base_dep_prepend(d)} "
DEPENDS_virtclass-nativesdk_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)}" 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 # THISDIR only works properly with imediate expansion as it has to run
# in the context of the location its used (:=) # in the context of the location its used (:=)
@@ -607,13 +595,6 @@ python () {
bb.data.setVar('MULTIMACH_ARCH', multiarch, d) 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): 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' 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'
meta/classes/utils.bbclass
+2 -1
View File
@@ -386,8 +386,9 @@ def explode_deps(s):
return bb.utils.explode_deps(s) return bb.utils.explode_deps(s)
def base_set_filespath(path, d): def base_set_filespath(path, d):
bb.note("base_set_filespath usage is deprecated, %s should be fixed" % d.getVar("P", 1))
filespath = [] filespath = []
extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split()
path = extrapaths + path
# The ":" ensures we have an 'empty' override # The ":" ensures we have an 'empty' override
overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
for p in path: for p in path: