[oe-commits] Andreas Oberritter : {kernel, module}.bbclass: don' t run depmod for module packages during do_rootfs

git at git.openembedded.org git at git.openembedded.org
Fri Apr 27 07:06:00 UTC 2012


Module: meta-openembedded.git
Branch: denzil
Commit: c557b72f6c82bd65cff8085571eb14659c90e46d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c557b72f6c82bd65cff8085571eb14659c90e46d

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Mon Apr 23 23:48:32 2012 +0200

{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 at opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/classes/kernel.bbclass |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 4d394c7..4b61c0c 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





More information about the Openembedded-commits mailing list