mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

relocatable.bbclass: Tidy up class

Browse Source 
There was a hard coded path and a spurious variable left in before the last
commit. Whoops ...

Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock
2010-02-12 17:10:50 +00:00
parent 12325e3c56
commit 7b4e80b98e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/relocatable.bbclass
+3 -4
View File
@@ -6,7 +6,6 @@ def rpath_replace (path, d):
import subprocess as sub import subprocess as sub
cmd = bb.data.expand('${CHRPATH_BIN}', d) cmd = bb.data.expand('${CHRPATH_BIN}', d)
tmpdir = bb.data.expand('${base_prefix}', d)
for root, dirs, files in os.walk(path): for root, dirs, files in os.walk(path):
for file in files: for file in files:
@@ -22,7 +21,7 @@ def rpath_replace (path, d):
rpaths = curr_rpath.split(":") rpaths = curr_rpath.split(":")
new_rpaths = [] new_rpaths = []
for rpath in rpaths: for rpath in rpaths:
depth = fpath.partition(tmpdir)[2].strip().count('/') depth = fpath.partition(path)[2].count('/')
if depth == 3: if depth == 3:
# / is two levels up # / is two levels up
root = "$ORIGIN/../.." root = "$ORIGIN/../.."
@@ -30,11 +29,11 @@ def rpath_replace (path, d):
root = "$ORIGIN/.." root = "$ORIGIN/.."
# kill everything up to "/" # kill everything up to "/"
new_rpaths.append("%s%s" % (root, rpath.partition(tmpdir)[2].strip())) new_rpaths.append("%s%s" % (root, rpath.partition(path)[2].strip()))
args = ":".join(new_rpaths) args = ":".join(new_rpaths)
#bb.note("Setting rpath to " + args) #bb.note("Setting rpath to " + args)
sub.call([cmd, '-r', args, fpath]) sub.call([cmd, '-r', args, fpath])
python relocatable_binaries_preprocess() { python relocatable_binaries_preprocess() {
rpath_replace(bb.data.expand("${SYSROOT_DESTDIR}${TMPDIR}/sysroots/${TARGET_ARCH}-${TARGET_OS}", d), d) rpath_replace(bb.data.getVar('base_prefix', d, True), d)
} }