summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-12-07 16:36:49 +0000
committerSteve Sakoman <steve@sakoman.com>2022-12-17 04:10:41 -1000
commit87543ed6550f7e78b3ddcfed0ef088bea932ba57 (patch)
treef416a4d317144e180932f41c4e98fb7609c1b00f /scripts/combo-layer
parent240c7dcad2f2e25efa269618c3bd6c549289207e (diff)
downloadopenembedded-core-contrib-87543ed6550f7e78b3ddcfed0ef088bea932ba57.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. 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>
Diffstat (limited to 'scripts/combo-layer')
-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):
f.close()
if of:
of.close()
- bb.utils.rename(patchfile + '.tmp', patchfile)
+ os.rename(of.name, patchfile)
def drop_to_shell(workdir=None):
if not sys.stdin.isatty():