mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 06:32:11 +02: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

8
meta/classes/relocatable.bbclass
View File

@@ -7,9 +7,9 @@ def process_dir (directory, d):
import subprocess as sub
import stat
cmd = bb.data.expand('${CHRPATH_BIN}', d)
cmd = d.expand('${CHRPATH_BIN}')
tmpdir = d.getVar('TMPDIR')
basedir = bb.data.expand('${base_prefix}', d)
basedir = d.expand('${base_prefix}')
#bb.debug("Checking %s for binaries to process" % directory)
if not os.path.exists(directory):
@@ -82,7 +82,7 @@ def process_dir (directory, d):
os.chmod(fpath, perms)
def rpath_replace (path, d):
bindirs = bb.data.expand("${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${libdir} ${base_libdir} ${libexecdir} ${PREPROCESS_RELOCATE_DIRS}", d).split()
bindirs = d.expand("${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${libdir} ${base_libdir} ${libexecdir} ${PREPROCESS_RELOCATE_DIRS}").split()
for bindir in bindirs:
#bb.note ("Processing directory " + bindir)
@@ -90,5 +90,5 @@ def rpath_replace (path, d):
process_dir (directory, d)
python relocatable_binaries_preprocess() {
rpath_replace(bb.data.expand('${SYSROOT_DESTDIR}', d), d)
rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d)
}