{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>
This commit is contained in:
parent
d7a6e09dc4
commit
931910c51c
|
@ -276,9 +276,7 @@ fi
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_postinst_modules () {
|
pkg_postinst_modules () {
|
||||||
if [ -n "$D" ]; then
|
if [ -z "$D" ]; then
|
||||||
${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
|
|
||||||
else
|
|
||||||
depmod -a
|
depmod -a
|
||||||
update-modules || true
|
update-modules || true
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -37,15 +37,14 @@ module_do_install() {
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_postinst_append () {
|
pkg_postinst_append () {
|
||||||
if [ -n "$D" ]; then
|
if [ -z "$D" ]; then
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
depmod -a
|
depmod -a
|
||||||
update-modules || true
|
update-modules || true
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_postrm_append () {
|
pkg_postrm_append () {
|
||||||
update-modules || true
|
update-modules || true
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_FUNCTIONS do_compile do_install
|
EXPORT_FUNCTIONS do_compile do_install
|
||||||
|
|
Loading…
Reference in New Issue