summaryrefslogtreecommitdiffstats
path: root/meta/classes/chrpath.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-09 16:31:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-16 23:32:39 +0100
commit1fc840ffc0267ecf3a15c4a59ab44869ef1d6339 (patch)
treeb2932a0d0d7146bde799db47497236063050fc84 /meta/classes/chrpath.bbclass
parent22c8ed6484e0ee9328e3844c9e794f3d89ebb9f7 (diff)
downloadpoky-1fc840ffc0267ecf3a15c4a59ab44869ef1d6339.tar.gz
meta: python3 megapatch
This needs splutting into smaller units, WIP atm. (From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/chrpath.bbclass')
-rw-r--r--meta/classes/chrpath.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 9c68855ab2..0182062adf 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -10,6 +10,8 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d):
10 if p.returncode != 0: 10 if p.returncode != 0:
11 return 11 return
12 12
13 err = err.decode('ascii')
14
13 # Handle RUNPATH as well as RPATH 15 # Handle RUNPATH as well as RPATH
14 err = err.replace("RUNPATH=","RPATH=") 16 err = err.replace("RUNPATH=","RPATH=")
15 # Throw away everything other than the rpath list 17 # Throw away everything other than the rpath list
@@ -103,7 +105,6 @@ def process_dir (rootdir, directory, d):
103 # Temporarily make the file writeable so we can chrpath it 105 # Temporarily make the file writeable so we can chrpath it
104 os.chmod(fpath, perms|stat.S_IRWXU) 106 os.chmod(fpath, perms|stat.S_IRWXU)
105 process_file(cmd, fpath, rootdir, baseprefix, tmpdir, d) 107 process_file(cmd, fpath, rootdir, baseprefix, tmpdir, d)
106
107 if perms: 108 if perms:
108 os.chmod(fpath, perms) 109 os.chmod(fpath, perms)
109 110