summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-12-07 16:36:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-23 23:05:57 +0000
commit313c607b8f048d9d7ea6eaca519a85812cdfc6c4 (patch)
tree8b1ab27bf34b2d516f4a18351948f52b3ee16f31
parente9d0e029478e79ca2ab305eccf34fcd49a5a2a3b (diff)
downloadpoky-313c607b8f048d9d7ea6eaca519a85812cdfc6c4.tar.gz
combo-layer: dont use bb.utils.rename
Bitbake may not be configured, and bb isn't imported anyway. Instead just use os.rename(), and take the filename from the file object instead of duplicating logic. (From OE-Core rev: acc824693463a06c77951ce913dbd356e48f711e) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 528f4fb3683d048537604e4562ea758968060d62) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index c122f4b5e4..e467f390c1 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -507,7 +507,7 @@ def check_patch(patchfile):
507 f.close() 507 f.close()
508 if of: 508 if of:
509 of.close() 509 of.close()
510 bb.utils.rename(patchfile + '.tmp', patchfile) 510 os.rename(of.name, patchfile)
511 511
512def drop_to_shell(workdir=None): 512def drop_to_shell(workdir=None):
513 if not sys.stdin.isatty(): 513 if not sys.stdin.isatty():