mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

kernel-module-split: use context manager to open files

Browse Source 
(From OE-Core rev: fc9c9471952042395bb405e7f6cf507bb2b72f31)

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jose Quaresma
2023-06-27 10:16:42 +00:00
committed by Richard Purdie
parent 66b8e3c14d
commit 696982900b
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes-recipe/kernel-module-split.bbclass
+10 -13
View File
@@ -69,9 +69,8 @@ python split_kernel_module_packages () {
cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile) cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile)
subprocess.check_call(cmd, shell=True) subprocess.check_call(cmd, shell=True)
# errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'ö') # errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'ö')
f = open(tmpfile, errors='replace') with open(tmpfile, errors='replace') as f:
l = f.read().split("\000") l = f.read().split("\000")
f.close()
os.close(tf[0]) os.close(tf[0])
os.unlink(tmpfile) os.unlink(tmpfile)
if compressed: if compressed:
@@ -101,13 +100,12 @@ python split_kernel_module_packages () {
conf = '/etc/modules-load.d/%s.conf' % basename conf = '/etc/modules-load.d/%s.conf' % basename
name = '%s%s' % (dvar, conf) name = '%s%s' % (dvar, conf)
os.makedirs(os.path.dirname(name), exist_ok=True) os.makedirs(os.path.dirname(name), exist_ok=True)
f = open(name, 'w') with open(name, 'w') as f:
if autoload: if autoload:
for m in autoload.split(): for m in autoload.split():
f.write('%s\n' % m) f.write('%s\n' % m)
else: else:
f.write('%s\n' % basename) f.write('%s\n' % basename)
f.close()
conf2append = ' %s' % conf conf2append = ' %s' % conf
d.appendVar('FILES:%s' % pkg, conf2append) d.appendVar('FILES:%s' % pkg, conf2append)
d.appendVar('CONFFILES:%s' % pkg, conf2append) d.appendVar('CONFFILES:%s' % pkg, conf2append)
@@ -124,9 +122,8 @@ python split_kernel_module_packages () {
conf = '/etc/modprobe.d/%s.conf' % basename conf = '/etc/modprobe.d/%s.conf' % basename
name = '%s%s' % (dvar, conf) name = '%s%s' % (dvar, conf)
os.makedirs(os.path.dirname(name), exist_ok=True) os.makedirs(os.path.dirname(name), exist_ok=True)
f = open(name, 'w') with open(name, 'w') as f:
f.write("%s\n" % modconf) f.write("%s\n" % modconf)
f.close()
conf2append = ' %s' % conf conf2append = ' %s' % conf
d.appendVar('FILES:%s' % pkg, conf2append) d.appendVar('FILES:%s' % pkg, conf2append)
d.appendVar('CONFFILES:%s' % pkg, conf2append) d.appendVar('CONFFILES:%s' % pkg, conf2append)