aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/classes
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-04-23 23:48:32 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2012-04-26 09:17:27 +0200
commitc557b72f6c82bd65cff8085571eb14659c90e46d (patch)
treef389c0f63d0f5a2a045c192d743d396ab28c8b1c /meta-oe/classes
parent56a34a9e60b825908e84e340b3fb06f6842aa82f (diff)
downloadmeta-openembedded-c557b72f6c82bd65cff8085571eb14659c90e46d.tar.gz
{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> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r--meta-oe/classes/kernel.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 4d394c7d63..4b61c0c493 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -281,9 +281,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