mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)

Browse Source 
sed \
 -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
 -i `grep -ril bb.data.expand *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2012-03-03 11:21:22 +00:00
parent 22f0df2aa7
commit b1aeaa8b0d
44 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/lib/oe/packagedata.py
View File

@@ -26,15 +26,15 @@ def read_pkgdatafile(fn):
return pkgdata
def get_subpkgedata_fn(pkg, d):
archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
archs = d.expand("${PACKAGE_ARCHS}").split(" ")
archs.reverse()
pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d)
targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d)
pkgdata = d.expand('${TMPDIR}/pkgdata/')
targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
for arch in archs:
fn = pkgdata + arch + targetdir + pkg
if os.path.exists(fn):
return fn
return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg)
def has_subpkgdata(pkg, d):
return os.access(get_subpkgedata_fn(pkg, d), os.R_OK)
@@ -43,11 +43,11 @@ def read_subpkgdata(pkg, d):
return read_pkgdatafile(get_subpkgedata_fn(pkg, d))
def has_pkgdata(pn, d):
fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
fn = d.expand('${PKGDATA_DIR}/%s' % pn)
return os.access(fn, os.R_OK)
def read_pkgdata(pn, d):
fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
fn = d.expand('${PKGDATA_DIR}/%s' % pn)
return read_pkgdatafile(fn)
#