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-01-26 22:32:00 +0000 |
commit | 2c14be3507e47c795d6e1e12ff2d8f186921b215 (patch) | |
tree | 814ba9f9c7a1a4d631bb897f84b61d53f6bbd3a6 | |
parent | 9dea876e096416d9961d0c0ccfe1505f40b889fd (diff) | |
download | poky-2c14be3507e47c795d6e1e12ff2d8f186921b215.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: 5eb8f15c48b5f39a10eb2b63b026cf1ebfd05533)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 a4e9dede01..0986a21651 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 | ||