On 25.04.2012 02:29, Darren Hart wrote:
>
>
> On 04/23/2012 02:48 PM, Andreas Oberritter wrote:
>> * depmod already gets executed by pkg_postinst_kernel-image.
>>
>> * If you build a module using module.bbclass,
>> pkg_postinst returns 1 in do_rootfs, causing
>> pkg_postinst to run again on first boot. To
>> improve this situation, I copied pkg_postinst
>> from kernel.bbclass to module.bbclass. This was
>> rejected by Koen, because he doesn't like the
>> code from kernel.bblcass, which uses
>> ${STAGING_DIR_KERNEL}. Richard then suggested
>> that calling depmod during do_rootfs wasn't
>> necessary at all, because it already gets done by
>> kernel-image.
>>
>
> Thanks for adding that in. I'm fine not addressing the reliance on the
> existence of $D for now (no worse than it was).
Can you explain what could be improved?
> Some whitespace issues
> persist in this version though.
No. See below.
>> Signed-off-by: Andreas Oberritter <o...@opendreambox.org>
>> ---
>> meta/classes/kernel.bbclass | 4 +---
>> meta/classes/module.bbclass | 7 +++----
>> 2 files changed, 4 insertions(+), 7 deletions(-)
>>
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index 3519e7c..c21ab96 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -276,9 +276,7 @@ fi
>> }
>>
>> pkg_postinst_modules () {
>> -if [ -n "$D" ]; then
>> - ${HOST_PREFIX}depmod -A -b $D -F
>> ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
>> -else
>> +if [ -z "$D" ]; then
>> depmod -a
>> update-modules || true
>> fi
>> diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
>> index 53c16b7..91628e4 100644
>> --- a/meta/classes/module.bbclass
>> +++ b/meta/classes/module.bbclass
>> @@ -37,15 +37,14 @@ module_do_install() {
>> }
>>
>> pkg_postinst_append () {
>> - if [ -n "$D" ]; then
>> - exit 1
>> - fi
>> +if [ -z "$D" ]; then
>> depmod -a
>> update-modules || true
>> +fi
>> }
>>
>> pkg_postrm_append () {
>> - update-modules || true
>> +update-modules || true
>
> This appears to be purely a whitespace change - and for the worse.
> Please drop this from the patch.
This just makes it equal to pkg_postrm from kernel.bbclass.
Code in pkg_postrm etc. gets copied to the postinst scripts verbatim.
Therefore any indentation results in strangely indented scripts inside
the package.
Regards,
Andreas
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
