From: Randy Witt Date: Thu, 4 Feb 2016 20:31:41 +0000 (-0800) Subject: copy_buildsystem.py: Pass the nativelsb argument to gen-lockedsig-cache X-Git-Tag: 2016-4~1084 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=760f7178e0267f930c8af9cb59039e317149f944;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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)