mirror of
https://git.yoctoproject.org/poky
synced 2026-06-13 04:59:52 +00:00
classes/lib/scripts: Use bb.utils.rename() instead of os.rename()
Incremental build in Docker fails with: OSError: [Errno 18] Invalid cross-device link when source and destination are on different overlay filesystems. Rather than adding fallback code to every call site, use a new wrapper in bitbake which detects this case and falls back to shutil.move which is slower but will handtle the overlay docker filesystems correctly. [YOCTO #14301] (From OE-Core rev: 656a65b2b84e7d529b89cf5de7eb838f902d84a2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
974441aeda
commit
b71375304f
+1
-1
@@ -508,7 +508,7 @@ def check_patch(patchfile):
|
||||
f.close()
|
||||
if of:
|
||||
of.close()
|
||||
os.rename(patchfile + '.tmp', patchfile)
|
||||
bb.utils.rename(patchfile + '.tmp', patchfile)
|
||||
|
||||
def drop_to_shell(workdir=None):
|
||||
if not sys.stdin.isatty():
|
||||
|
||||
@@ -746,7 +746,7 @@ def _check_preserve(config, recipename):
|
||||
os.remove(removefile)
|
||||
else:
|
||||
tf.write(line)
|
||||
os.rename(newfile, origfile)
|
||||
bb.utils.rename(newfile, origfile)
|
||||
|
||||
def get_staging_kver(srcdir):
|
||||
# Kernel version from work-shared
|
||||
@@ -1094,10 +1094,10 @@ def rename(args, config, basepath, workspace):
|
||||
|
||||
# Rename bbappend
|
||||
logger.info('Renaming %s to %s' % (append, newappend))
|
||||
os.rename(append, newappend)
|
||||
bb.utils.rename(append, newappend)
|
||||
# Rename recipe file
|
||||
logger.info('Renaming %s to %s' % (recipefile, newfile))
|
||||
os.rename(recipefile, newfile)
|
||||
bb.utils.rename(recipefile, newfile)
|
||||
|
||||
# Rename source tree if it's the default path
|
||||
appendmd5 = None
|
||||
@@ -1333,7 +1333,7 @@ def _export_patches(srctree, rd, start_rev, destdir, changed_revs=None):
|
||||
if match_name:
|
||||
# Rename patch files
|
||||
if new_patch != match_name:
|
||||
os.rename(os.path.join(destdir, new_patch),
|
||||
bb.utils.rename(os.path.join(destdir, new_patch),
|
||||
os.path.join(destdir, match_name))
|
||||
# Need to pop it off the list now before checking changed_revs
|
||||
oldpath = existing_patches.pop(old_patch)
|
||||
|
||||
@@ -71,7 +71,8 @@ def _rename_recipe_dirs(oldpv, newpv, path):
|
||||
if oldfile.find(oldpv) != -1:
|
||||
newfile = oldfile.replace(oldpv, newpv)
|
||||
if oldfile != newfile:
|
||||
os.rename(os.path.join(path, oldfile), os.path.join(path, newfile))
|
||||
bb.utils.rename(os.path.join(path, oldfile),
|
||||
os.path.join(path, newfile))
|
||||
|
||||
def _rename_recipe_file(oldrecipe, bpn, oldpv, newpv, path):
|
||||
oldrecipe = os.path.basename(oldrecipe)
|
||||
|
||||
@@ -616,5 +616,5 @@ class PartitionedImage():
|
||||
part.start + part.size_sec - 1, part.size_sec)
|
||||
|
||||
partimage = self.path + '.p%d' % part.num
|
||||
os.rename(source, partimage)
|
||||
bb.utils.rename(source, partimage)
|
||||
self.partimages.append(partimage)
|
||||
|
||||
Reference in New Issue
Block a user