diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-26 13:20:24 +1300 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2016-02-03 09:48:12 -0800 |
| commit | 2ed6adfea5ba16aeda7b5d908bea4303202d3774 (patch) | |
| tree | ae1a5284ac1c7c5eb955f20446a70b363cb132cc | |
| parent | f070d5fee56a4589a6abf422e6872373c5557c6d (diff) | |
| download | openembedded-core-contrib-2ed6adfea5ba16aeda7b5d908bea4303202d3774.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.
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>
| -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: # 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) |