summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 11:21:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 18:23:53 (GMT)
commitb1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94 (patch)
tree62b315fdc05e03677922a0161fdc7a39e2985466 /meta/lib
parent22f0df2aa737bda1ae3bce862ee5ceba5b2d204b (diff)
downloadpoky-b1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94.tar.gz
meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/data.py2
-rw-r--r--meta/lib/oe/packagedata.py12
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/lib/oe/data.py b/meta/lib/oe/data.py
index af900be..e50f453 100644
--- a/meta/lib/oe/data.py
+++ b/meta/lib/oe/data.py
@@ -7,7 +7,7 @@ def typed_value(key, d):
7 var_type = d.getVarFlag(key, 'type') 7 var_type = d.getVarFlag(key, 'type')
8 flags = d.getVarFlags(key) 8 flags = d.getVarFlags(key)
9 if flags is not None: 9 if flags is not None:
10 flags = dict((flag, bb.data.expand(value, d)) 10 flags = dict((flag, d.expand(value))
11 for flag, value in flags.iteritems()) 11 for flag, value in flags.iteritems())
12 else: 12 else:
13 flags = {} 13 flags = {}
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index 918e7ad..a7a40f0 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -26,15 +26,15 @@ def read_pkgdatafile(fn):
26 return pkgdata 26 return pkgdata
27 27
28def get_subpkgedata_fn(pkg, d): 28def get_subpkgedata_fn(pkg, d):
29 archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") 29 archs = d.expand("${PACKAGE_ARCHS}").split(" ")
30 archs.reverse() 30 archs.reverse()
31 pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d) 31 pkgdata = d.expand('${TMPDIR}/pkgdata/')
32 targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d) 32 targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
33 for arch in archs: 33 for arch in archs:
34 fn = pkgdata + arch + targetdir + pkg 34 fn = pkgdata + arch + targetdir + pkg
35 if os.path.exists(fn): 35 if os.path.exists(fn):
36 return fn 36 return fn
37 return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) 37 return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg)
38 38
39def has_subpkgdata(pkg, d): 39def has_subpkgdata(pkg, d):
40 return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) 40 return os.access(get_subpkgedata_fn(pkg, d), os.R_OK)
@@ -43,11 +43,11 @@ def read_subpkgdata(pkg, d):
43 return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) 43 return read_pkgdatafile(get_subpkgedata_fn(pkg, d))
44 44
45def has_pkgdata(pn, d): 45def has_pkgdata(pn, d):
46 fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) 46 fn = d.expand('${PKGDATA_DIR}/%s' % pn)
47 return os.access(fn, os.R_OK) 47 return os.access(fn, os.R_OK)
48 48
49def read_pkgdata(pn, d): 49def read_pkgdata(pn, d):
50 fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) 50 fn = d.expand('${PKGDATA_DIR}/%s' % pn)
51 return read_pkgdatafile(fn) 51 return read_pkgdatafile(fn)
52 52
53# 53#