summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-04-23 23:48:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-24 17:47:29 +0100
commitc7809c03080925b5e9171df5c9175c7c6420b376 (patch)
tree62cdb9023278845d042c7707b978b5e44e2ba8c7
parent24472a794e1787ebcd700dde66018a31069aa50b (diff)
downloadopenembedded-core-c7809c03080925b5e9171df5c9175c7c6420b376.tar.gz
openembedded-core-c7809c03080925b5e9171df5c9175c7c6420b376.tar.bz2
openembedded-core-c7809c03080925b5e9171df5c9175c7c6420b376.tar.xz
openembedded-core-c7809c03080925b5e9171df5c9175c7c6420b376.zip
{kernel, module}.bbclass: don't run depmod for module packages during do_rootfs
* 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 <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass4
-rw-r--r--meta/classes/module.bbclass7
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 7c5240bd3..139bad9ce 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 53c16b738..91628e429 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