[OE-core] [PATCH] kernel-devicetree.bbclass: replace KERNEL_IMAGETYPE_FOR_MAKE with KERNEL_IMAGETYPE

[Andre McCurdy]

On Thu, May 31, 2018 at 1:55 AM,  <liu.ming50 at gmail.com> wrote:
> From: Ming Liu <liu.ming50 at gmail.com>
>
> It should be KERNEL_IMAGETYPE rather than KERNEL_IMAGETYPE_FOR_MAKE to

KERNEL_IMAGETYPE is a legacy variable, in the process of being
replaced by KERNEL_IMAGETYPES. You should probably use the new
variable if possible.

> be handled in do_install and do_deploy tasks, since we are having some
> special logic in kernel-uimage.bbclass and kernel-fitimage.bbclass to
> replace the real kernel image types during do_compile, like:
> in kernel-uimage.bbclass: uImage -> vmlinux
> in kernel-fitimage.bbclass: fitImage -> Image/bzImage/zImage...
>
> but the final images to be installed/deployed should still be uImage or
> fitImage.
>
> Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
> ---
>  meta/classes/kernel-devicetree.bbclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
> index 4f80cc6..04e6321 100644
> --- a/meta/classes/kernel-devicetree.bbclass
> +++ b/meta/classes/kernel-devicetree.bbclass
> @@ -63,7 +63,7 @@ do_install_append() {
>                 DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"`
>                 DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
>                 install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT}
> -               for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
> +               for type in ${KERNEL_IMAGETYPE}; do
>                         symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
>                         DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
>                         ln -sf ${DTB_BASE_NAME}.${DTB_EXT} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT}
> @@ -82,7 +82,7 @@ do_deploy_append() {
>                 DTB=`normalize_dtb "${DTB}"`
>                 DTB_EXT=${DTB##*.}
>                 DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
> -               for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
> +               for type in ${KERNEL_IMAGETYPE}; do
>                         base_name=${type}"-"${KERNEL_IMAGE_BASE_NAME}
>                         symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
>                         DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core