diff options
Diffstat (limited to 'meta/classes/relocatable.bbclass')
-rw-r--r-- | meta/classes/relocatable.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass index 54227a91ca..072f533f4f 100644 --- a/meta/classes/relocatable.bbclass +++ b/meta/classes/relocatable.bbclass | |||
@@ -7,9 +7,9 @@ def process_dir (directory, d): | |||
7 | import subprocess as sub | 7 | import subprocess as sub |
8 | import stat | 8 | import stat |
9 | 9 | ||
10 | cmd = bb.data.expand('${CHRPATH_BIN}', d) | 10 | cmd = d.expand('${CHRPATH_BIN}') |
11 | tmpdir = d.getVar('TMPDIR') | 11 | tmpdir = d.getVar('TMPDIR') |
12 | basedir = bb.data.expand('${base_prefix}', d) | 12 | basedir = d.expand('${base_prefix}') |
13 | 13 | ||
14 | #bb.debug("Checking %s for binaries to process" % directory) | 14 | #bb.debug("Checking %s for binaries to process" % directory) |
15 | if not os.path.exists(directory): | 15 | if not os.path.exists(directory): |
@@ -82,7 +82,7 @@ def process_dir (directory, d): | |||
82 | os.chmod(fpath, perms) | 82 | os.chmod(fpath, perms) |
83 | 83 | ||
84 | def rpath_replace (path, d): | 84 | def rpath_replace (path, d): |
85 | bindirs = bb.data.expand("${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${libdir} ${base_libdir} ${libexecdir} ${PREPROCESS_RELOCATE_DIRS}", d).split() | 85 | bindirs = d.expand("${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${libdir} ${base_libdir} ${libexecdir} ${PREPROCESS_RELOCATE_DIRS}").split() |
86 | 86 | ||
87 | for bindir in bindirs: | 87 | for bindir in bindirs: |
88 | #bb.note ("Processing directory " + bindir) | 88 | #bb.note ("Processing directory " + bindir) |
@@ -90,5 +90,5 @@ def rpath_replace (path, d): | |||
90 | process_dir (directory, d) | 90 | process_dir (directory, d) |
91 | 91 | ||
92 | python relocatable_binaries_preprocess() { | 92 | python relocatable_binaries_preprocess() { |
93 | rpath_replace(bb.data.expand('${SYSROOT_DESTDIR}', d), d) | 93 | rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) |
94 | } | 94 | } |