From 2ed6adfea5ba16aeda7b5d908bea4303202d3774 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 26 Jan 2016 13:20:24 +1300 Subject: gen-lockedsig-cache: fix bad destination path joining When copying the sstate-cache into the extensible SDK, if the source path had a trailing / and the destination path did not, there would be a missing / between the path and the subdirectory name, and you'd end up with subdirectories like "sstate-cacheCentOS-6.7". There are functions in os.path for this sort of thing so let's just use them and avoid the problem. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton (cherry picked from commit 5eb8f15c48b5f39a10eb2b63b026cf1ebfd05533) Signed-off-by: Saul Wold --- scripts/gen-lockedsig-cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen-lockedsig-cache b/scripts/gen-lockedsig-cache index 9c16506cd6..6aa3614002 100755 --- a/scripts/gen-lockedsig-cache +++ b/scripts/gen-lockedsig-cache @@ -41,7 +41,7 @@ for f in files: # Most likely a temp file, skip it print('skipping') continue - dst = f.replace(sys.argv[2], sys.argv[3]) + dst = os.path.join(sys.argv[3], os.path.relpath(f, sys.argv[2])) destdir = os.path.dirname(dst) mkdir(destdir) -- cgit 1.2.3-korg