summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2016-02-04 12:31:41 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-06 23:10:44 +0000
commitf1f844775078b4218c99ba8c9dc7d15c9a9eb780 (patch)
treee0829c90060c5b27e4bf3aaafae234326367b6d5
parentb1308054f5fb62b7fcf7398f440be681061d6655 (diff)
downloadpoky-f1f844775078b4218c99ba8c9dc7d15c9a9eb780.tar.gz
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. (From OE-Core rev: 760f7178e0267f930c8af9cb59039e317149f944) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/copy_buildsystem.py9
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
160 if fixedlsbstring: 160 if fixedlsbstring:
161 nativedir = output_sstate_cache + '/' + nativelsbstring 161 nativedir = output_sstate_cache + '/' + nativelsbstring
162 if os.path.isdir(nativedir): 162 if os.path.isdir(nativedir):
163 os.rename(nativedir, output_sstate_cache + '/' + fixedlsbstring) 163 destdir = os.path.join(output_sstate_cache, fixedlsbstring)
164 bb.utils.mkdirhier(destdir)
165
166 dirlist = os.listdir(nativedir)
167 for i in dirlist:
168 src = os.path.join(nativedir, i)
169 dest = os.path.join(destdir, i)
170 os.rename(src, dest)