[OE-core] [PATCH] kernel-module-split.bbclass: fix autoloading from postinst script

[Bruce Ashfield]

On Mon, Mar 23, 2015 at 6:03 PM, Andreas Oberritter
<obi at opendreambox.org> wrote:
> On 23.03.2015 21:51, Bruce Ashfield wrote:
>> On Mon, Mar 23, 2015 at 11:39 AM, Andreas Oberritter
>> <obi at opendreambox.org> wrote:
>>> When using KERNEL_MODULE_AUTOLOAD, autoload was empty, causing
>>> "modprobe None" to get appended to the postinst script.
>>
>> I stared at this a bit and it looks right to me, but let me ask a
>> question. Are you saying
>> that KERNEL_MODULE_AUTOLOAD isn't working for anyone ? Or just in a specific
>> configuration ?
>>
>> I don't have a build to check this at the moment, but I swear my
>> autoloads were working!
>
> It already works on boot. This patch only fixes autoloading of modules
> installed from a package feed, i.e. modprobed by a postinst script.

Aha! Right you are, and of course the writing of the modules-load.d is already
using basename.

The entire routine could use a bit of cleaning up .. but this fix does
in fact look
fine to me.

Acked-by: Bruce Ashfield <bruce.ashfield at windriver.com>

>
> Regards,
> Andreas
>
>>
>> Bruce
>>
>>>
>>> Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
>>> ---
>>>  meta/classes/kernel-module-split.bbclass | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
>>> index 68a23f8..e1a70e6 100644
>>> --- a/meta/classes/kernel-module-split.bbclass
>>> +++ b/meta/classes/kernel-module-split.bbclass
>>> @@ -148,7 +148,7 @@ python split_kernel_module_packages () {
>>>              postinst = d.getVar('pkg_postinst_%s' % pkg, True)
>>>              if not postinst:
>>>                  bb.fatal("pkg_postinst_%s not defined" % pkg)
>>> -            postinst += d.getVar('autoload_postinst_fragment', True) % autoload
>>> +            postinst += d.getVar('autoload_postinst_fragment', True) % (autoload or basename)
>>>              d.setVar('pkg_postinst_%s' % pkg, postinst)
>>>
>>>          # Write out any modconf fragment
>>> --
>>> 1.9.1
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>>
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"