summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorDevendra Tewari <devendra.tewari@gmail.com>2021-04-19 14:23:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-06 10:16:23 (GMT)
commitb71375304f393db62e0894af66e9a60bb9a5c8cc (patch)
treeac14a351c1c6cd0ba2679c18a4de92c71dee0e7f /meta/classes/package.bbclass
parent974441aeda1a2e601865743e945e0332c115ef76 (diff)
downloadpoky-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 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e3f0a70..cf30f33 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1049,7 +1049,7 @@ python fixup_perms () {
1049 # Create path to move directory to, move it, and then setup the symlink 1049 # Create path to move directory to, move it, and then setup the symlink
1050 bb.utils.mkdirhier(os.path.dirname(target)) 1050 bb.utils.mkdirhier(os.path.dirname(target))
1051 #bb.note("Fixup Perms: Rename %s -> %s" % (dir, ptarget)) 1051 #bb.note("Fixup Perms: Rename %s -> %s" % (dir, ptarget))
1052 os.rename(origin, target) 1052 bb.utils.rename(origin, target)
1053 #bb.note("Fixup Perms: Link %s -> %s" % (dir, link)) 1053 #bb.note("Fixup Perms: Link %s -> %s" % (dir, link))
1054 os.symlink(link, origin) 1054 os.symlink(link, origin)
1055 1055
@@ -1967,7 +1967,7 @@ python package_do_shlibs() {
1967 1967
1968 for (old, new) in renames: 1968 for (old, new) in renames:
1969 bb.note("Renaming %s to %s" % (old, new)) 1969 bb.note("Renaming %s to %s" % (old, new))
1970 os.rename(old, new) 1970 bb.utils.rename(old, new)
1971 pkgfiles[pkg].remove(old) 1971 pkgfiles[pkg].remove(old)
1972 1972
1973 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list") 1973 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list")