summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/kernel.bbclass12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 736768eedd..6633b8552d 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -123,7 +123,6 @@ kernel_do_install() {
123 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} 123 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
124 install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} 124 install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
125 [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} 125 [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
126 install -d ${D}/etc/modutils
127 install -d ${D}/etc/modules-load.d 126 install -d ${D}/etc/modules-load.d
128 install -d ${D}/etc/modprobe.d 127 install -d ${D}/etc/modprobe.d
129 128
@@ -411,7 +410,7 @@ python populate_packages_prepend () {
411 410
412 dvar = d.getVar('PKGD', True) 411 dvar = d.getVar('PKGD', True)
413 412
414 # If autoloading is requested, output /etc/modutils/<name> and append 413 # If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
415 # appropriate modprobe commands to the postinst 414 # appropriate modprobe commands to the postinst
416 autoload = d.getVar('module_autoload_%s' % basename, True) 415 autoload = d.getVar('module_autoload_%s' % basename, True)
417 if autoload: 416 if autoload:
@@ -420,9 +419,6 @@ python populate_packages_prepend () {
420 for m in autoload.split(): 419 for m in autoload.split():
421 f.write('%s\n' % m) 420 f.write('%s\n' % m)
422 f.close() 421 f.close()
423 modutils_name = '%s/etc/modutils/%s' % (dvar, basename)
424 modutils_target = '../modules-load.d/%s.conf' % (basename)
425 os.symlink(modutils_target, modutils_name)
426 postinst = d.getVar('pkg_postinst_%s' % pkg, True) 422 postinst = d.getVar('pkg_postinst_%s' % pkg, True)
427 if not postinst: 423 if not postinst:
428 bb.fatal("pkg_postinst_%s not defined" % pkg) 424 bb.fatal("pkg_postinst_%s not defined" % pkg)
@@ -438,7 +434,7 @@ python populate_packages_prepend () {
438 f.close() 434 f.close()
439 435
440 files = d.getVar('FILES_%s' % pkg, True) 436 files = d.getVar('FILES_%s' % pkg, True)
441 files = "%s /etc/modutils/%s /etc/modutils/%s.conf /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename, basename, basename) 437 files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
442 d.setVar('FILES_%s' % pkg, files) 438 d.setVar('FILES_%s' % pkg, files)
443 439
444 if vals.has_key("description"): 440 if vals.has_key("description"):
@@ -464,11 +460,11 @@ python populate_packages_prepend () {
464 do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') 460 do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
465 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)) 461 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))
466 462
467 # If modutils and modprobe.d are empty at this point, remove them to 463 # If modules-load.d and modprobe.d are empty at this point, remove them to
468 # avoid warnings. removedirs only raises an OSError if an empty 464 # avoid warnings. removedirs only raises an OSError if an empty
469 # directory cannot be removed. 465 # directory cannot be removed.
470 dvar = d.getVar('PKGD', True) 466 dvar = d.getVar('PKGD', True)
471 for dir in ["%s/etc/modutils" % (dvar), "%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]: 467 for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
472 if len(os.listdir(dir)) == 0: 468 if len(os.listdir(dir)) == 0:
473 os.rmdir(dir) 469 os.rmdir(dir)
474 470