diff options
author | Devendra Tewari <devendra.tewari@gmail.com> | 2021-04-19 11:23:58 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-06 11:16:23 +0100 |
commit | b71375304f393db62e0894af66e9a60bb9a5c8cc (patch) | |
tree | ac14a351c1c6cd0ba2679c18a4de92c71dee0e7f /scripts/combo-layer | |
parent | 974441aeda1a2e601865743e945e0332c115ef76 (diff) | |
download | poky-b71375304f393db62e0894af66e9a60bb9a5c8cc.tar.gz |
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>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index a634dd69d2..045de65642 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -508,7 +508,7 @@ def check_patch(patchfile): | |||
508 | f.close() | 508 | f.close() |
509 | if of: | 509 | if of: |
510 | of.close() | 510 | of.close() |
511 | os.rename(patchfile + '.tmp', patchfile) | 511 | bb.utils.rename(patchfile + '.tmp', patchfile) |
512 | 512 | ||
513 | def drop_to_shell(workdir=None): | 513 | def drop_to_shell(workdir=None): |
514 | if not sys.stdin.isatty(): | 514 | if not sys.stdin.isatty(): |