diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2013-08-09 10:58:42 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-08-13 10:13:19 -0700 |
| commit | 35f538b117e3387354d2dab1f22c3de28ab1322b (patch) | |
| tree | 0ecaefc121c2319d57c2cddff3594071aa901527 | |
| parent | 002818712fab5c6325b1f7205512945ea87ad76c (diff) | |
| download | openembedded-core-35f538b117e3387354d2dab1f22c3de28ab1322b.tar.gz openembedded-core-35f538b117e3387354d2dab1f22c3de28ab1322b.tar.bz2 openembedded-core-35f538b117e3387354d2dab1f22c3de28ab1322b.zip | |
kernel.bbclass: Correct post(inst|rm) package association
Fixes [YOCTO #4991]
The kernel image is installed as part of the kernel-image package, but
the symlink creation/removal via alternatives is being done in
pkg_post(inst|rm)_kernel-base.
Move the postinst alternatives logic into the kernel-image functions.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/kernel.bbclass | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index ca49aec53a..e039dfc15c 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -237,14 +237,6 @@ do_savedefconfig() { do_savedefconfig[nostamp] = "1" addtask savedefconfig after do_configure -pkg_postinst_kernel-base () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true -} - -pkg_postrm_kernel-base () { - update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true -} - inherit cml1 EXPORT_FUNCTIONS do_compile do_install do_configure @@ -272,14 +264,19 @@ ALLOW_EMPTY_kernel-modules = "1" DESCRIPTION_kernel-modules = "Kernel modules meta package" pkg_postinst_kernel-image () { -if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then - mkdir -p $D/lib/modules/${KERNEL_VERSION} -fi -if [ -n "$D" ]; then - depmodwrapper -a -b $D ${KERNEL_VERSION} -else - depmod -a ${KERNEL_VERSION} -fi + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then + mkdir -p $D/lib/modules/${KERNEL_VERSION} + fi + if [ -n "$D" ]; then + depmodwrapper -a -b $D ${KERNEL_VERSION} + else + depmod -a ${KERNEL_VERSION} + fi +} + +pkg_postrm_kernel-image () { + update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true } PACKAGESPLITFUNCS_prepend = "split_kernel_packages " |