diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-26 13:20:24 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:20:17 +0000 |
commit | ee52ac6e85a531042ce7e8bbee65a097f22a6e80 (patch) | |
tree | 09e0193a83179352c4e0a8bc5779e1642e5dd58c /scripts/gen-lockedsig-cache | |
parent | e9f95df962c1da66d95382df143da21c91bfcf82 (diff) | |
download | poky-ee52ac6e85a531042ce7e8bbee65a097f22a6e80.tar.gz |
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.
(From OE-Core rev: 2ed6adfea5ba16aeda7b5d908bea4303202d3774)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 5eb8f15c48b5f39a10eb2b63b026cf1ebfd05533)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/gen-lockedsig-cache')
-rwxr-xr-x | scripts/gen-lockedsig-cache | 2 |
1 files changed, 1 insertions, 1 deletions
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: | |||
41 | # Most likely a temp file, skip it | 41 | # Most likely a temp file, skip it |
42 | print('skipping') | 42 | print('skipping') |
43 | continue | 43 | continue |
44 | dst = f.replace(sys.argv[2], sys.argv[3]) | 44 | dst = os.path.join(sys.argv[3], os.path.relpath(f, sys.argv[2])) |
45 | destdir = os.path.dirname(dst) | 45 | destdir = os.path.dirname(dst) |
46 | mkdir(destdir) | 46 | mkdir(destdir) |
47 | 47 | ||