diff options
| author | Randy Witt <randy.e.witt@linux.intel.com> | 2016-02-04 12:31:41 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-06 23:08:56 +0000 |
| commit | 760f7178e0267f930c8af9cb59039e317149f944 (patch) | |
| tree | a5d3d3b50bf39eb3dbd3d509262e348440b029c3 /meta/lib | |
| parent | 26c4fd5c57996a3f600096d02c7e765ef36d7853 (diff) | |
| download | openembedded-core-760f7178e0267f930c8af9cb59039e317149f944.tar.gz openembedded-core-760f7178e0267f930c8af9cb59039e317149f944.tar.bz2 openembedded-core-760f7178e0267f930c8af9cb59039e317149f944.zip | |
copy_buildsystem.py: Pass the nativelsb argument to gen-lockedsig-cache
If the nativelsb argument is not used, then create_locked_sstate_cache()
can get collisions when moving the files from the input_sstate_cache
to the output_sstate_cache.
The specific case where this was encountered was when a "universal"
nativelsb directory already existed in the input_sstate_cache.
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/copy_buildsystem.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index abee5d9a77..5074a43cb9 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py @@ -160,4 +160,11 @@ def create_locked_sstate_cache(lockedsigs, input_sstate_cache, output_sstate_cac if fixedlsbstring: nativedir = output_sstate_cache + '/' + nativelsbstring if os.path.isdir(nativedir): - os.rename(nativedir, output_sstate_cache + '/' + fixedlsbstring) + destdir = os.path.join(output_sstate_cache, fixedlsbstring) + bb.utils.mkdirhier(destdir) + + dirlist = os.listdir(nativedir) + for i in dirlist: + src = os.path.join(nativedir, i) + dest = os.path.join(destdir, i) + os.rename(src, dest) |