diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-04-23 23:48:32 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:43:38 +0100 |
| commit | 663b4be025283a30adb823760ce9d9a056106bcf (patch) | |
| tree | bfa2ed808c9a22cac7219d3ccf6e3be1837db576 | |
| parent | 915769c405e24751eae613e9ef55f05490a726de (diff) | |
| download | openembedded-core-663b4be025283a30adb823760ce9d9a056106bcf.tar.gz openembedded-core-663b4be025283a30adb823760ce9d9a056106bcf.tar.bz2 openembedded-core-663b4be025283a30adb823760ce9d9a056106bcf.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.bbclass | 4 | ||||
| -rw-r--r-- | 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 3519e7c296..c21ab96ca9 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 53c16b7389..91628e429c 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 |