diff options
| author | Ross Burton <ross.burton@arm.com> | 2022-12-07 16:36:49 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-23 23:05:50 +0000 |
| commit | 3cdbb5cc249e1dd53f927326b104fd4102f08d49 (patch) | |
| tree | 628df31579168d8a317700c455fdbf7e5cf2151a | |
| parent | f86718661ab45366e1630bdbffe2ea374555de3e (diff) | |
| download | poky-3cdbb5cc249e1dd53f927326b104fd4102f08d49.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: 87543ed6550f7e78b3ddcfed0ef088bea932ba57)
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-x | scripts/combo-layer | 2 |
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 | ||
| 512 | def drop_to_shell(workdir=None): | 512 | def drop_to_shell(workdir=None): |
| 513 | if not sys.stdin.isatty(): | 513 | if not sys.stdin.isatty(): |