diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-04-23 23:48:32 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-31 21:15:09 +0100 |
commit | 5c507a2fd7514a943b950fb0b2134c3fa3c4419a (patch) | |
tree | 273f4096334e012e4cd286fa2c463008d176ad88 /meta/classes/kernel.bbclass | |
parent | bf4740cf66fe4579e7c55512dc2887e3f2decb83 (diff) | |
download | poky-5c507a2fd7514a943b950fb0b2134c3fa3c4419a.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: 663b4be025283a30adb823760ce9d9a056106bcf)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel.bbclass')
-rw-r--r-- | meta/classes/kernel.bbclass | 4 |
1 files changed, 1 insertions, 3 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 | |||
276 | } | 276 | } |
277 | 277 | ||
278 | pkg_postinst_modules () { | 278 | pkg_postinst_modules () { |
279 | if [ -n "$D" ]; then | 279 | if [ -z "$D" ]; then |
280 | ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} | ||
281 | else | ||
282 | depmod -a | 280 | depmod -a |
283 | update-modules || true | 281 | update-modules || true |
284 | fi | 282 | fi |