mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-09 16:19:59 +00:00
kernel.bbclass: convert tab indentation in python functions into four-space
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Richard Purdie
committed by
Koen Kooi
Koen Kooi
parent
bf63e5def3
commit
4712cc5da0
+154
-154
@@ -318,177 +318,177 @@ module_conf_sco = "alias bt-proto-2 sco"
|
|||||||
module_conf_rfcomm = "alias bt-proto-3 rfcomm"
|
module_conf_rfcomm = "alias bt-proto-3 rfcomm"
|
||||||
|
|
||||||
python populate_packages_prepend () {
|
python populate_packages_prepend () {
|
||||||
def extract_modinfo(file):
|
def extract_modinfo(file):
|
||||||
import tempfile, re, subprocess
|
import tempfile, re, subprocess
|
||||||
tempfile.tempdir = d.getVar("WORKDIR", True)
|
tempfile.tempdir = d.getVar("WORKDIR", True)
|
||||||
tf = tempfile.mkstemp()
|
tf = tempfile.mkstemp()
|
||||||
tmpfile = tf[1]
|
tmpfile = tf[1]
|
||||||
cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("PATH", True), d.getVar("HOST_PREFIX", True) or "", file, tmpfile)
|
cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("PATH", True), d.getVar("HOST_PREFIX", True) or "", file, tmpfile)
|
||||||
subprocess.call(cmd, shell=True)
|
subprocess.call(cmd, shell=True)
|
||||||
f = open(tmpfile)
|
f = open(tmpfile)
|
||||||
l = f.read().split("\000")
|
l = f.read().split("\000")
|
||||||
f.close()
|
f.close()
|
||||||
os.close(tf[0])
|
os.close(tf[0])
|
||||||
os.unlink(tmpfile)
|
os.unlink(tmpfile)
|
||||||
exp = re.compile("([^=]+)=(.*)")
|
exp = re.compile("([^=]+)=(.*)")
|
||||||
vals = {}
|
vals = {}
|
||||||
for i in l:
|
for i in l:
|
||||||
m = exp.match(i)
|
m = exp.match(i)
|
||||||
if not m:
|
if not m:
|
||||||
continue
|
continue
|
||||||
vals[m.group(1)] = m.group(2)
|
vals[m.group(1)] = m.group(2)
|
||||||
return vals
|
return vals
|
||||||
|
|
||||||
def parse_depmod():
|
def parse_depmod():
|
||||||
import re
|
import re
|
||||||
|
|
||||||
dvar = d.getVar('PKGD', True)
|
dvar = d.getVar('PKGD', True)
|
||||||
if not dvar:
|
if not dvar:
|
||||||
bb.error("PKGD not defined")
|
bb.error("PKGD not defined")
|
||||||
return
|
return
|
||||||
|
|
||||||
kernelver = d.getVar('KERNEL_VERSION', True)
|
kernelver = d.getVar('KERNEL_VERSION', True)
|
||||||
kernelver_stripped = kernelver
|
kernelver_stripped = kernelver
|
||||||
m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
|
m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
|
||||||
if m:
|
if m:
|
||||||
kernelver_stripped = m.group(1)
|
kernelver_stripped = m.group(1)
|
||||||
path = d.getVar("PATH", True)
|
path = d.getVar("PATH", True)
|
||||||
|
|
||||||
cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
|
cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
|
||||||
f = os.popen(cmd, 'r')
|
f = os.popen(cmd, 'r')
|
||||||
|
|
||||||
deps = {}
|
deps = {}
|
||||||
pattern0 = "^(.*\.k?o):..*$"
|
pattern0 = "^(.*\.k?o):..*$"
|
||||||
pattern1 = "^(.*\.k?o):\s*(.*\.k?o)\s*$"
|
pattern1 = "^(.*\.k?o):\s*(.*\.k?o)\s*$"
|
||||||
pattern2 = "^(.*\.k?o):\s*(.*\.k?o)\s*\\\$"
|
pattern2 = "^(.*\.k?o):\s*(.*\.k?o)\s*\\\$"
|
||||||
pattern3 = "^\t(.*\.k?o)\s*\\\$"
|
pattern3 = "^\t(.*\.k?o)\s*\\\$"
|
||||||
pattern4 = "^\t(.*\.k?o)\s*$"
|
pattern4 = "^\t(.*\.k?o)\s*$"
|
||||||
|
|
||||||
line = f.readline()
|
line = f.readline()
|
||||||
while line:
|
while line:
|
||||||
if not re.match(pattern0, line):
|
if not re.match(pattern0, line):
|
||||||
line = f.readline()
|
line = f.readline()
|
||||||
continue
|
continue
|
||||||
m1 = re.match(pattern1, line)
|
m1 = re.match(pattern1, line)
|
||||||
if m1:
|
if m1:
|
||||||
deps[m1.group(1)] = m1.group(2).split()
|
deps[m1.group(1)] = m1.group(2).split()
|
||||||
else:
|
else:
|
||||||
m2 = re.match(pattern2, line)
|
m2 = re.match(pattern2, line)
|
||||||
if m2:
|
if m2:
|
||||||
deps[m2.group(1)] = m2.group(2).split()
|
deps[m2.group(1)] = m2.group(2).split()
|
||||||
line = f.readline()
|
line = f.readline()
|
||||||
m3 = re.match(pattern3, line)
|
m3 = re.match(pattern3, line)
|
||||||
while m3:
|
while m3:
|
||||||
deps[m2.group(1)].extend(m3.group(1).split())
|
deps[m2.group(1)].extend(m3.group(1).split())
|
||||||
line = f.readline()
|
line = f.readline()
|
||||||
m3 = re.match(pattern3, line)
|
m3 = re.match(pattern3, line)
|
||||||
m4 = re.match(pattern4, line)
|
m4 = re.match(pattern4, line)
|
||||||
deps[m2.group(1)].extend(m4.group(1).split())
|
deps[m2.group(1)].extend(m4.group(1).split())
|
||||||
line = f.readline()
|
line = f.readline()
|
||||||
f.close()
|
f.close()
|
||||||
return deps
|
return deps
|
||||||
|
|
||||||
def get_dependencies(file, pattern, format):
|
def get_dependencies(file, pattern, format):
|
||||||
# file no longer includes PKGD
|
# file no longer includes PKGD
|
||||||
file = file.replace(d.getVar('PKGD', True) or '', '', 1)
|
file = file.replace(d.getVar('PKGD', True) or '', '', 1)
|
||||||
# instead is prefixed with /lib/modules/${KERNEL_VERSION}
|
# instead is prefixed with /lib/modules/${KERNEL_VERSION}
|
||||||
file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
|
file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
|
||||||
|
|
||||||
if module_deps.has_key(file):
|
if module_deps.has_key(file):
|
||||||
import re
|
import re
|
||||||
dependencies = []
|
dependencies = []
|
||||||
for i in module_deps[file]:
|
for i in module_deps[file]:
|
||||||
m = re.match(pattern, os.path.basename(i))
|
m = re.match(pattern, os.path.basename(i))
|
||||||
if not m:
|
if not m:
|
||||||
continue
|
continue
|
||||||
on = legitimize_package_name(m.group(1))
|
on = legitimize_package_name(m.group(1))
|
||||||
dependency_pkg = format % on
|
dependency_pkg = format % on
|
||||||
dependencies.append(dependency_pkg)
|
dependencies.append(dependency_pkg)
|
||||||
return dependencies
|
return dependencies
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def frob_metadata(file, pkg, pattern, format, basename):
|
def frob_metadata(file, pkg, pattern, format, basename):
|
||||||
import re
|
import re
|
||||||
vals = extract_modinfo(file)
|
vals = extract_modinfo(file)
|
||||||
|
|
||||||
dvar = d.getVar('PKGD', True)
|
dvar = d.getVar('PKGD', True)
|
||||||
|
|
||||||
# If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
|
# If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
|
||||||
# appropriate modprobe commands to the postinst
|
# appropriate modprobe commands to the postinst
|
||||||
autoload = d.getVar('module_autoload_%s' % basename, True)
|
autoload = d.getVar('module_autoload_%s' % basename, True)
|
||||||
if autoload:
|
if autoload:
|
||||||
name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
|
name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
|
||||||
f = open(name, 'w')
|
f = open(name, 'w')
|
||||||
for m in autoload.split():
|
for m in autoload.split():
|
||||||
f.write('%s\n' % m)
|
f.write('%s\n' % m)
|
||||||
f.close()
|
f.close()
|
||||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
bb.fatal("pkg_postinst_%s not defined" % pkg)
|
bb.fatal("pkg_postinst_%s not defined" % pkg)
|
||||||
postinst += d.getVar('autoload_postinst_fragment', True) % autoload
|
postinst += d.getVar('autoload_postinst_fragment', True) % autoload
|
||||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||||
|
|
||||||
# Write out any modconf fragment
|
# Write out any modconf fragment
|
||||||
modconf = d.getVar('module_conf_%s' % basename, True)
|
modconf = d.getVar('module_conf_%s' % basename, True)
|
||||||
if modconf:
|
if modconf:
|
||||||
name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
|
name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
|
||||||
f = open(name, 'w')
|
f = open(name, 'w')
|
||||||
f.write("%s\n" % modconf)
|
f.write("%s\n" % modconf)
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
files = d.getVar('FILES_%s' % pkg, True)
|
files = d.getVar('FILES_%s' % pkg, True)
|
||||||
files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
|
files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
|
||||||
d.setVar('FILES_%s' % pkg, files)
|
d.setVar('FILES_%s' % pkg, files)
|
||||||
|
|
||||||
if vals.has_key("description"):
|
if vals.has_key("description"):
|
||||||
old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
|
old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
|
||||||
d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
|
d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
|
||||||
|
|
||||||
rdepends_str = d.getVar('RDEPENDS_' + pkg, True)
|
rdepends_str = d.getVar('RDEPENDS_' + pkg, True)
|
||||||
if rdepends_str:
|
if rdepends_str:
|
||||||
rdepends = rdepends_str.split()
|
rdepends = rdepends_str.split()
|
||||||
else:
|
else:
|
||||||
rdepends = []
|
rdepends = []
|
||||||
rdepends.extend(get_dependencies(file, pattern, format))
|
rdepends.extend(get_dependencies(file, pattern, format))
|
||||||
d.setVar('RDEPENDS_' + pkg, ' '.join(rdepends))
|
d.setVar('RDEPENDS_' + pkg, ' '.join(rdepends))
|
||||||
|
|
||||||
module_deps = parse_depmod()
|
module_deps = parse_depmod()
|
||||||
module_regex = '^(.*)\.k?o$'
|
module_regex = '^(.*)\.k?o$'
|
||||||
module_pattern = 'kernel-module-%s'
|
module_pattern = 'kernel-module-%s'
|
||||||
|
|
||||||
postinst = d.getVar('pkg_postinst_modules', True)
|
postinst = d.getVar('pkg_postinst_modules', True)
|
||||||
postrm = d.getVar('pkg_postrm_modules', True)
|
postrm = d.getVar('pkg_postrm_modules', True)
|
||||||
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||||
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||||
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||||
do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
|
do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
|
||||||
|
|
||||||
# If modules-load.d and modprobe.d are empty at this point, remove them to
|
# If modules-load.d and modprobe.d are empty at this point, remove them to
|
||||||
# avoid warnings. removedirs only raises an OSError if an empty
|
# avoid warnings. removedirs only raises an OSError if an empty
|
||||||
# directory cannot be removed.
|
# directory cannot be removed.
|
||||||
dvar = d.getVar('PKGD', True)
|
dvar = d.getVar('PKGD', True)
|
||||||
for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]:
|
for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]:
|
||||||
if len(os.listdir(dir)) == 0:
|
if len(os.listdir(dir)) == 0:
|
||||||
os.rmdir(dir)
|
os.rmdir(dir)
|
||||||
|
|
||||||
import re
|
import re
|
||||||
metapkg = "kernel-modules"
|
metapkg = "kernel-modules"
|
||||||
d.setVar('ALLOW_EMPTY_' + metapkg, "1")
|
d.setVar('ALLOW_EMPTY_' + metapkg, "1")
|
||||||
d.setVar('FILES_' + metapkg, "")
|
d.setVar('FILES_' + metapkg, "")
|
||||||
blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
|
blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
|
||||||
for l in module_deps.values():
|
for l in module_deps.values():
|
||||||
for i in l:
|
for i in l:
|
||||||
pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
|
pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
|
||||||
blacklist.append(pkg)
|
blacklist.append(pkg)
|
||||||
metapkg_rdepends = []
|
metapkg_rdepends = []
|
||||||
packages = d.getVar('PACKAGES', True).split()
|
packages = d.getVar('PACKAGES', True).split()
|
||||||
for pkg in packages[1:]:
|
for pkg in packages[1:]:
|
||||||
if not pkg in blacklist and not pkg in metapkg_rdepends:
|
if not pkg in blacklist and not pkg in metapkg_rdepends:
|
||||||
metapkg_rdepends.append(pkg)
|
metapkg_rdepends.append(pkg)
|
||||||
d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
|
d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
|
||||||
d.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package')
|
d.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package')
|
||||||
packages.append(metapkg)
|
packages.append(metapkg)
|
||||||
d.setVar('PACKAGES', ' '.join(packages))
|
d.setVar('PACKAGES', ' '.join(packages))
|
||||||
}
|
}
|
||||||
|
|
||||||
# Support checking the kernel size since some kernels need to reside in partitions
|
# Support checking the kernel size since some kernels need to reside in partitions
|
||||||
|
|||||||
Reference in New Issue
Block a user