[OE-core] [PATCH] kernel-fitimage.bbclass: Don't assume KERNEL_IMAGETYPE == fitImage

[Nathan Rossi]

Just pinging these patches, to see if there were any issues or
comments. I realize I sent them just before a release so it was very
likely they would get lost in the noise.

Thanks,
Nathan

On 21 October 2016 at 22:07, Nathan Rossi <nathan at nathanrossi.com> wrote:
> The name of the output image for a fitImage that contains a ramdisk
> should match the same as for the fitImage that does not contain a
> ramdisk. As such it should not be assumed that KERNEL_IMAGETYPE is
> "fitImage". This change explicitly sets the name of the output
> ramdisk/initramfs to start with fitImage as does the non-ramdisk output.
>
> Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
> ---
>  meta/classes/kernel-fitimage.bbclass | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
> index 5c9e76b9ac..55529b161f 100644
> --- a/meta/classes/kernel-fitimage.bbclass
> +++ b/meta/classes/kernel-fitimage.bbclass
> @@ -419,11 +419,11 @@ kernel_do_deploy_append() {
>
>                 if [ -n "${INITRAMFS_IMAGE}" ]; then
>                         echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
> -                       its_initramfs_base_name="${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> -                       its_initramfs_symlink_name=${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${MACHINE}
> +                       its_initramfs_base_name="fitImage-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> +                       its_initramfs_symlink_name=fitImage-its-${INITRAMFS_IMAGE}-${MACHINE}
>                         install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its
> -                       fit_initramfs_base_name="${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> -                       fit_initramfs_symlink_name=${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}
> +                       fit_initramfs_base_name="fitImage-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> +                       fit_initramfs_symlink_name=fitImage-${INITRAMFS_IMAGE}-${MACHINE}
>                         install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin
>                 fi
>
> --
> 2.9.3