diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-03-21 18:02:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-22 12:12:20 +0000 |
commit | 9ce1f7d522aac19e0f88ae4f4066aee89c2ac678 (patch) | |
tree | 08343f422db4d8b2ace6b88d06a091a991fbb907 /meta/classes/kernel.bbclass | |
parent | 0c3d5768e7a67c30a9525e91985690a09a9b9d48 (diff) | |
download | poky-9ce1f7d522aac19e0f88ae4f4066aee89c2ac678.tar.gz |
classes/kernel: move module postinst commands to kernel-base
Since kernel-base is the package that contains the files that depmod
needs to run, we should be running depmod from the kernel-base
postinstall rather than kernel-image.
Fixes [YOCTO #5392].
(From OE-Core rev: f7d2cb383281ec8dfa90950ba04d87dd29ffc676)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel.bbclass')
-rw-r--r-- | meta/classes/kernel.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 6953109e8b..19b159b492 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -362,8 +362,7 @@ ALLOW_EMPTY_kernel-image = "1" | |||
362 | ALLOW_EMPTY_kernel-modules = "1" | 362 | ALLOW_EMPTY_kernel-modules = "1" |
363 | DESCRIPTION_kernel-modules = "Kernel modules meta package" | 363 | DESCRIPTION_kernel-modules = "Kernel modules meta package" |
364 | 364 | ||
365 | pkg_postinst_kernel-image () { | 365 | pkg_postinst_kernel-base () { |
366 | update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true | ||
367 | if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then | 366 | if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then |
368 | mkdir -p $D/lib/modules/${KERNEL_VERSION} | 367 | mkdir -p $D/lib/modules/${KERNEL_VERSION} |
369 | fi | 368 | fi |
@@ -374,6 +373,10 @@ pkg_postinst_kernel-image () { | |||
374 | fi | 373 | fi |
375 | } | 374 | } |
376 | 375 | ||
376 | pkg_postinst_kernel-image () { | ||
377 | update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true | ||
378 | } | ||
379 | |||
377 | pkg_postrm_kernel-image () { | 380 | pkg_postrm_kernel-image () { |
378 | update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true | 381 | update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true |
379 | } | 382 | } |