From: Andreas Oberritter <[email protected]>
* 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.
Signed-off-by: Andreas Oberritter <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
---
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
}
EXPORT_FUNCTIONS do_compile do_install
--
1.7.9.5
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
