diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-06-07 22:52:42 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-18 16:34:41 +0100 |
commit | 4aeda14352a9fa9dd5ba50cf940a2b514fd1ac3c (patch) | |
tree | 64ca11137149baa25d2b09cd6007efe8525b9301 | |
parent | 70fabbb2d05c8e66b0055679086dd2a7aa2dcff9 (diff) | |
download | poky-4aeda14352a9fa9dd5ba50cf940a2b514fd1ac3c.tar.gz |
rootfs.py: close kernel_abi_ver_file
* fixes:
oe-core/meta/lib/oe/rootfs.py:331: ResourceWarning: unclosed file <_io.TextIOWrapper name='pkgdata/mach/kernel-depmod/kernel-abiversion' mode='r' encoding='UTF-8'>
kernel_ver = open(kernel_abi_ver_file).read().strip(' \n')
(From OE-Core rev: 0f7a8359ba370c7f5d5153453ed699e9566f5b1d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f9dd8ee063c1132265248457fcd628e1e93727be)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/rootfs.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 61ccf369f1..9e6b411fb6 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -328,7 +328,9 @@ class Rootfs(object, metaclass=ABCMeta): | |||
328 | if not os.path.exists(kernel_abi_ver_file): | 328 | if not os.path.exists(kernel_abi_ver_file): |
329 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) | 329 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) |
330 | 330 | ||
331 | kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') | 331 | with open(kernel_abi_ver_file) as f: |
332 | kernel_ver = f.read().strip(' \n') | ||
333 | |||
332 | versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver) | 334 | versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver) |
333 | 335 | ||
334 | bb.utils.mkdirhier(versioned_modules_dir) | 336 | bb.utils.mkdirhier(versioned_modules_dir) |