kernel.bbclass: populate /etc/modules-load.d/ with module_autoload entries too

* /etc/modules-load.d/foo.conf is used by systemd like /etc/modutils/foo was with sysvinit

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

1 files changed, 8 insertions, 2 deletions

diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index cd36e5590..41a741f9a 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -127,6 +127,7 @@ kernel_do_install() {
         install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
         [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
         install -d ${D}/etc/modutils
+        install -d ${D}/etc/modules-load.d
         install -d ${D}/etc/modprobe.d
 
         #
@@ -416,6 +417,11 @@ python populate_packages_prepend () {
                         for m in autoload.split():
                                 f.write('%s\n' % m)
                         f.close()
+                        name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
+                        f = open(name, 'w')
+                        for m in autoload.split():
+                                f.write('%s\n' % m)
+                        f.close()
                         postinst = d.getVar('pkg_postinst_%s' % pkg, True)
                         if not postinst:
                                 bb.fatal("pkg_postinst_%s not defined" % pkg)
@@ -431,7 +437,7 @@ python populate_packages_prepend () {
                         f.close()
 
                 files = d.getVar('FILES_%s' % pkg, True)
-                files = "%s /etc/modutils/%s /etc/modutils/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename, basename)
+                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)
                 d.setVar('FILES_%s' % pkg, files)
 
                 if vals.has_key("description"):
@@ -461,7 +467,7 @@ python populate_packages_prepend () {
         # avoid warnings. removedirs only raises an OSError if an empty
         # directory cannot be removed.
         dvar = d.getVar('PKGD', True)
-        for dir in ["%s/etc/modutils" % (dvar), "%s/etc/modprobe.d" % (dvar)]:
+        for dir in ["%s/etc/modutils" % (dvar), "%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
                 if len(os.listdir(dir)) == 0:
                         os.rmdir(dir)