diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2023-06-27 10:16:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-28 23:17:13 +0100 |
commit | 696982900b068b89f3b5aca63b2e855abb511cdc (patch) | |
tree | a398b2e1899b3b5e40d4565b5f15fb229e9022bf /meta/classes-recipe/kernel-module-split.bbclass | |
parent | 66b8e3c14d18b6256dbfd9043ebb21f8a71a0d15 (diff) | |
download | poky-696982900b068b89f3b5aca63b2e855abb511cdc.tar.gz |
kernel-module-split: use context manager to open files
(From OE-Core rev: fc9c9471952042395bb405e7f6cf507bb2b72f31)
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/kernel-module-split.bbclass')
-rw-r--r-- | meta/classes-recipe/kernel-module-split.bbclass | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass index 9467a28208..c59e10adcd 100644 --- a/meta/classes-recipe/kernel-module-split.bbclass +++ b/meta/classes-recipe/kernel-module-split.bbclass | |||
@@ -69,9 +69,8 @@ python split_kernel_module_packages () { | |||
69 | cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile) | 69 | cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile) |
70 | subprocess.check_call(cmd, shell=True) | 70 | subprocess.check_call(cmd, shell=True) |
71 | # errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'ö') | 71 | # errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'ö') |
72 | f = open(tmpfile, errors='replace') | 72 | with open(tmpfile, errors='replace') as f: |
73 | l = f.read().split("\000") | 73 | l = f.read().split("\000") |
74 | f.close() | ||
75 | os.close(tf[0]) | 74 | os.close(tf[0]) |
76 | os.unlink(tmpfile) | 75 | os.unlink(tmpfile) |
77 | if compressed: | 76 | if compressed: |
@@ -101,13 +100,12 @@ python split_kernel_module_packages () { | |||
101 | conf = '/etc/modules-load.d/%s.conf' % basename | 100 | conf = '/etc/modules-load.d/%s.conf' % basename |
102 | name = '%s%s' % (dvar, conf) | 101 | name = '%s%s' % (dvar, conf) |
103 | os.makedirs(os.path.dirname(name), exist_ok=True) | 102 | os.makedirs(os.path.dirname(name), exist_ok=True) |
104 | f = open(name, 'w') | 103 | with open(name, 'w') as f: |
105 | if autoload: | 104 | if autoload: |
106 | for m in autoload.split(): | 105 | for m in autoload.split(): |
107 | f.write('%s\n' % m) | 106 | f.write('%s\n' % m) |
108 | else: | 107 | else: |
109 | f.write('%s\n' % basename) | 108 | f.write('%s\n' % basename) |
110 | f.close() | ||
111 | conf2append = ' %s' % conf | 109 | conf2append = ' %s' % conf |
112 | d.appendVar('FILES:%s' % pkg, conf2append) | 110 | d.appendVar('FILES:%s' % pkg, conf2append) |
113 | d.appendVar('CONFFILES:%s' % pkg, conf2append) | 111 | d.appendVar('CONFFILES:%s' % pkg, conf2append) |
@@ -124,9 +122,8 @@ python split_kernel_module_packages () { | |||
124 | conf = '/etc/modprobe.d/%s.conf' % basename | 122 | conf = '/etc/modprobe.d/%s.conf' % basename |
125 | name = '%s%s' % (dvar, conf) | 123 | name = '%s%s' % (dvar, conf) |
126 | os.makedirs(os.path.dirname(name), exist_ok=True) | 124 | os.makedirs(os.path.dirname(name), exist_ok=True) |
127 | f = open(name, 'w') | 125 | with open(name, 'w') as f: |
128 | f.write("%s\n" % modconf) | 126 | f.write("%s\n" % modconf) |
129 | f.close() | ||
130 | conf2append = ' %s' % conf | 127 | conf2append = ' %s' % conf |
131 | d.appendVar('FILES:%s' % pkg, conf2append) | 128 | d.appendVar('FILES:%s' % pkg, conf2append) |
132 | d.appendVar('CONFFILES:%s' % pkg, conf2append) | 129 | d.appendVar('CONFFILES:%s' % pkg, conf2append) |