[OE-core] [for dylan][PATCH] kernel.bbclass: Correct post(inst|rm) package association

[Denys Dmytriyenko]

Ping. Is Dylan still alive?


On Tue, Sep 24, 2013 at 12:58:20PM -0500, Franklin S. Cooper Jr wrote:
> From: Darren Hart <dvhart at linux.intel.com>
> 
> 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 at linux.intel.com>
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> ---
>  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 3320747..c417038 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 "
> -- 
> 1.7.0.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core