summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-26 13:20:24 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-26 22:31:10 +0000
commit5eb8f15c48b5f39a10eb2b63b026cf1ebfd05533 (patch)
treeb6b1b54071758bb87fa1910da2338ef714a41e92
parent50f0a2a041df679f06c0b93a0472905e8c129bd4 (diff)
downloadopenembedded-core-5eb8f15c48b5f39a10eb2b63b026cf1ebfd05533.tar.gz
openembedded-core-5eb8f15c48b5f39a10eb2b63b026cf1ebfd05533.tar.bz2
openembedded-core-5eb8f15c48b5f39a10eb2b63b026cf1ebfd05533.zip
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 <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rwxr-xr-xscripts/gen-lockedsig-cache2
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:
# 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)