On 03/23/2012 05:56 AM, Martin Jansa wrote:
> * /etc/modules-load.d/foo.conf is used by systemd like /etc/modutils/foo was
> with sysvinit
>
> Signed-off-by: Martin Jansa <[email protected]>
> ---
> meta/classes/kernel.bbclass | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 169df33..975ae13 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -122,6 +122,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
>
> #
> @@ -411,6 +412,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()
Seems to me we should do either or, depending on if systemd is supported
in the image. Is there a way to check here?
Also, we have variables for system paths like "etc", any reason we
aren't using those here?
> postinst = d.getVar('pkg_postinst_%s' % pkg, True)
> if not postinst:
> bb.fatal("pkg_postinst_%s not defined" % pkg)
> @@ -426,7 +432,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"):
> @@ -456,7 +462,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)
>
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
