kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.

kernel-fitimage.bbclass replaces an occurance of "fitImage" in
KERNEL_IMAGETYPE_FOR_MAKE by an image type that is buildable for the
architecture (such as zImage). The kernel-fitimage.bbclass packs that
image as sub-image in a flattened image tree image (fitImage) and
deploys this fitImage along with the image tree source file (.its).

kernel-fitimage.bbclass does not alter KERNEL_IMAGETYPES, which thus
also contains "fitImage", which kernel.bbclass will also deploy
redundantly with different naming.

The result is a dual deployment with slightly different naming,
each with a set of symlinks.

The solution chosen is to have fitImage deployment be handled by
kernel-fitimage.bbclass, and have kernel.bbclass ignore fitImage
types during deployment.

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6b734be2b67509e3caa21e71eec50400d3be3744..bfb42439694917039e8f10a34a4142abe463a1b5 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -667,8 +667,11 @@ kernel_do_deploy() {
        fi
 
        for imageType in ${KERNEL_IMAGETYPES} ; do
-               base_name=${imageType}-${KERNEL_IMAGE_NAME}
-               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
+               # kernel-fitimage class deploys fitImages, skip here
+               if [ "$imageType" != "fitImage" ]; then
+                       base_name=${imageType}-${KERNEL_IMAGE_NAME}
+                       install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
+               fi
        done
        if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                mkdir -p ${D}/lib
@@ -685,10 +688,13 @@ kernel_do_deploy() {
 
        if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
                for imageType in ${KERNEL_IMAGETYPES} ; do
-                       initramfs_base_name=${imageType}-${INITRAMFS_NAME}
-                       initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
-                       install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
-                       ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
+                       # kernel-fitimage class deploys fitImages, skip here
+                       if [ "$imageType" != "fitImage" ]; then
+                               initramfs_base_name=${imageType}-${INITRAMFS_NAME}
+                               initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
+                               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
+                               ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
+                       fi
                done
        fi
 }