summaryrefslogtreecommitdiffstats
path: root/meta/classes/module.bbclass
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-26 10:05:15 +0100
commit931910c51c0cd9fb3174abf418f61105fbbd3596 (patch)
tree071767921da64067d7bb8a128d68f95eda536e8e /meta/classes/module.bbclass
parentd7a6e09dc4a6ac119041056741653bf6faaf25b7 (diff)
downloadpoky-931910c51c0cd9fb3174abf418f61105fbbd3596.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. (From OE-Core rev: c7809c03080925b5e9171df5c9175c7c6420b376) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/module.bbclass')
-rw-r--r--meta/classes/module.bbclass7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 53c16b7389..91628e429c 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -37,15 +37,14 @@ module_do_install() {
37} 37}
38 38
39pkg_postinst_append () { 39pkg_postinst_append () {
40 if [ -n "$D" ]; then 40if [ -z "$D" ]; then
41 exit 1
42 fi
43 depmod -a 41 depmod -a
44 update-modules || true 42 update-modules || true
43fi
45} 44}
46 45
47pkg_postrm_append () { 46pkg_postrm_append () {
48 update-modules || true 47update-modules || true
49} 48}
50 49
51EXPORT_FUNCTIONS do_compile do_install 50EXPORT_FUNCTIONS do_compile do_install