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 (From OE-Core rev: 1487af02b92278dec2eb539377cc29bb1b404153) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8132ac5f6c
commit
c6db496be6
|
@ -122,6 +122,7 @@ kernel_do_install() {
|
||||||
install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
|
install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
|
||||||
[ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${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/modutils
|
||||||
|
install -d ${D}/etc/modules-load.d
|
||||||
install -d ${D}/etc/modprobe.d
|
install -d ${D}/etc/modprobe.d
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -411,6 +412,11 @@ python populate_packages_prepend () {
|
||||||
for m in autoload.split():
|
for m in autoload.split():
|
||||||
f.write('%s\n' % m)
|
f.write('%s\n' % m)
|
||||||
f.close()
|
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)
|
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)
|
||||||
|
@ -426,7 +432,7 @@ python populate_packages_prepend () {
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
files = d.getVar('FILES_%s' % pkg, True)
|
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)
|
d.setVar('FILES_%s' % pkg, files)
|
||||||
|
|
||||||
if vals.has_key("description"):
|
if vals.has_key("description"):
|
||||||
|
@ -456,7 +462,7 @@ python populate_packages_prepend () {
|
||||||
# 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/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:
|
if len(os.listdir(dir)) == 0:
|
||||||
os.rmdir(dir)
|
os.rmdir(dir)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue