base/utils.bbclass: Sync up overlapping functions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 2c71571b3f7e876f25b4e3fb4131e59dc684d771..4cb5732c795eb20068e395be2631ff555f7bd931 100644 (file)
--- 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 ae6fb0d7191391f1cc5d161387b12979a4c3128c..02e803a702778f363bd337e3b86621db03d0a113 100644 (file)
--- 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: