summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRuslan Bilovol <rbilovol@cisco.com>2017-11-22 11:20:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-24 10:52:27 (GMT)
commitbf5b43495a99bb8d002e02c688746e78c9430c21 (patch)
tree6f4e21e6b52678ac0a72d92be7a5be146252530c /scripts
parent2019f782604a554412cc2ceb0f46760a83984487 (diff)
downloadpoky-bf5b43495a99bb8d002e02c688746e78c9430c21.tar.gz
relocate_sdk.py: remove hardcoded SDK path
This patch removes hardcodes added to relocate_sdk.py during SDK build, making it flexible and reusable. Now default SDK path is passed to the script as parameter rather then harcoded inside it. This allows to reuse this script for multiple relocations, and adds possibility to relocate SDK multiple times (From OE-Core rev: 6671a4d980c8bef8f402780a308f6c43a25044aa) Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/relocate_sdk.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py
index c752fa2..0d5a6f5 100755
--- a/scripts/relocate_sdk.py
+++ b/scripts/relocate_sdk.py
@@ -38,8 +38,6 @@ else:
38 def b(x): 38 def b(x):
39 return x.encode(sys.getfilesystemencoding()) 39 return x.encode(sys.getfilesystemencoding())
40 40
41old_prefix = re.compile(b("##DEFAULT_INSTALL_DIR##"))
42
43def get_arch(): 41def get_arch():
44 f.seek(0) 42 f.seek(0)
45 e_ident =f.read(16) 43 e_ident =f.read(16)
@@ -212,19 +210,22 @@ def change_dl_sysdirs(elf_file_name):
212 f.write(sysdirslen) 210 f.write(sysdirslen)
213 211
214# MAIN 212# MAIN
215if len(sys.argv) < 4: 213if len(sys.argv) < 5:
216 sys.exit(-1) 214 sys.exit(-1)
217 215
218# In python > 3, strings may also contain Unicode characters. So, convert 216# In python > 3, strings may also contain Unicode characters. So, convert
219# them to bytes 217# them to bytes
220if sys.version_info < (3,): 218if sys.version_info < (3,):
221 new_prefix = sys.argv[1] 219 new_prefix = sys.argv[2]
222 new_dl_path = sys.argv[2] 220 new_dl_path = sys.argv[3]
223else: 221else:
224 new_prefix = sys.argv[1].encode() 222 new_prefix = sys.argv[2].encode()
225 new_dl_path = sys.argv[2].encode() 223 new_dl_path = sys.argv[3].encode()
224
225executables_list = sys.argv[4:]
226 226
227executables_list = sys.argv[3:] 227old_prefix_ne = b(sys.argv[1])
228old_prefix = re.compile(re.escape(old_prefix_ne));
228 229
229for e in executables_list: 230for e in executables_list:
230 perms = os.stat(e)[stat.ST_MODE] 231 perms = os.stat(e)[stat.ST_MODE]