Message ID | 20220607205242.1773119-2-Martin.Jansa@gmail.com |
---|---|
State | Accepted, archived |
Commit | f9dd8ee063c1132265248457fcd628e1e93727be |
Headers | show |
Series | [1/2] buildhistory.bbclass: fix shell syntax when using dash | expand |
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): if not os.path.exists(kernel_abi_ver_file): bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) - kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') + with open(kernel_abi_ver_file) as f: + kernel_ver = f.read().strip(' \n') + versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver) bb.utils.mkdirhier(versioned_modules_dir)
* 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') Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/lib/oe/rootfs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)