diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-03-23 06:48:43 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-23 07:56:21 +0100 |
commit | b020571752610ec4e46be7d1578b019a1f29be4e (patch) | |
tree | 69df0507e29b6f0cdc4be6962cb7194f4be25ef5 /meta-oe/classes | |
parent | efc1626c8ec48149437ab46228f52eeaf43c9416 (diff) | |
download | meta-openembedded-b020571752610ec4e46be7d1578b019a1f29be4e.tar.gz |
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>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r-- | meta-oe/classes/kernel.bbclass | 10 |
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() { | |||
127 | install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} | 127 | install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} |
128 | [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} | 128 | [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} |
129 | install -d ${D}/etc/modutils | 129 | install -d ${D}/etc/modutils |
130 | install -d ${D}/etc/modules-load.d | ||
130 | install -d ${D}/etc/modprobe.d | 131 | install -d ${D}/etc/modprobe.d |
131 | 132 | ||
132 | # | 133 | # |
@@ -416,6 +417,11 @@ python populate_packages_prepend () { | |||
416 | for m in autoload.split(): | 417 | for m in autoload.split(): |
417 | f.write('%s\n' % m) | 418 | f.write('%s\n' % m) |
418 | f.close() | 419 | f.close() |
420 | name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename) | ||
421 | f = open(name, 'w') | ||
422 | for m in autoload.split(): | ||
423 | f.write('%s\n' % m) | ||
424 | f.close() | ||
419 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) | 425 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) |
420 | if not postinst: | 426 | if not postinst: |
421 | bb.fatal("pkg_postinst_%s not defined" % pkg) | 427 | bb.fatal("pkg_postinst_%s not defined" % pkg) |
@@ -431,7 +437,7 @@ python populate_packages_prepend () { | |||
431 | f.close() | 437 | f.close() |
432 | 438 | ||
433 | files = d.getVar('FILES_%s' % pkg, True) | 439 | files = d.getVar('FILES_%s' % pkg, True) |
434 | files = "%s /etc/modutils/%s /etc/modutils/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename, basename) | 440 | 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) |
435 | d.setVar('FILES_%s' % pkg, files) | 441 | d.setVar('FILES_%s' % pkg, files) |
436 | 442 | ||
437 | if vals.has_key("description"): | 443 | if vals.has_key("description"): |
@@ -461,7 +467,7 @@ python populate_packages_prepend () { | |||
461 | # avoid warnings. removedirs only raises an OSError if an empty | 467 | # avoid warnings. removedirs only raises an OSError if an empty |
462 | # directory cannot be removed. | 468 | # directory cannot be removed. |
463 | dvar = d.getVar('PKGD', True) | 469 | dvar = d.getVar('PKGD', True) |
464 | for dir in ["%s/etc/modutils" % (dvar), "%s/etc/modprobe.d" % (dvar)]: | 470 | for dir in ["%s/etc/modutils" % (dvar), "%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]: |
465 | if len(os.listdir(dir)) == 0: | 471 | if len(os.listdir(dir)) == 0: |
466 | os.rmdir(dir) | 472 | os.rmdir(dir) |
467 | 473 | ||