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-04-11 12:02:49 +0100 |
commit | 337de046c8144b2fbcd7799a11828dc3eb34b839 (patch) | |
tree | b1d81f30bcb75a63daa4cd1f33680147186d5f2e | |
parent | 8d0f411fdbc209895d0f8958d156dc0561d61161 (diff) | |
download | poky-337de046c8144b2fbcd7799a11828dc3eb34b839.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 master rev: f7d2cb383281ec8dfa90950ba04d87dd29ffc676)
(From OE-Core rev: ac92a5ab25ddfd8462c43bac6f93730b1e454a4f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 e639bd57b9..925aed1a07 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -337,8 +337,7 @@ ALLOW_EMPTY_kernel-image = "1" | |||
337 | ALLOW_EMPTY_kernel-modules = "1" | 337 | ALLOW_EMPTY_kernel-modules = "1" |
338 | DESCRIPTION_kernel-modules = "Kernel modules meta package" | 338 | DESCRIPTION_kernel-modules = "Kernel modules meta package" |
339 | 339 | ||
340 | pkg_postinst_kernel-image () { | 340 | pkg_postinst_kernel-base () { |
341 | update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true | ||
342 | if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then | 341 | if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then |
343 | mkdir -p $D/lib/modules/${KERNEL_VERSION} | 342 | mkdir -p $D/lib/modules/${KERNEL_VERSION} |
344 | fi | 343 | fi |
@@ -349,6 +348,10 @@ pkg_postinst_kernel-image () { | |||
349 | fi | 348 | fi |
350 | } | 349 | } |
351 | 350 | ||
351 | pkg_postinst_kernel-image () { | ||
352 | update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true | ||
353 | } | ||
354 | |||
352 | pkg_postrm_kernel-image () { | 355 | pkg_postrm_kernel-image () { |
353 | update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true | 356 | update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true |
354 | } | 357 | } |