kernel.bbclass: Avoid iterating over KERNEL_IMAGETYPES twice

During deploy we iterate over KERNEL_IMAGETYPES twice, with no consumer
of our changes in the interim. Collapse these two loops into one.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 396627e7efa1570d31cd0f62aa38577ef4d8d83d..d0fbbd19899b8d626f6122f6a01dca1cd2be4854 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -669,20 +669,17 @@ kernel_do_deploy() {
        for imageType in ${KERNEL_IMAGETYPES} ; do
                base_name=${imageType}-${KERNEL_IMAGE_NAME}
                install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
+               symlink_name=${imageType}-${KERNEL_IMAGE_LINK_NAME}
+               ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
+               ln -sf ${base_name}.bin $deployDir/${imageType}
        done
+
        if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                mkdir -p ${D}${root_prefix}/lib
                tar -cvzf $deployDir/modules-${MODULE_TARBALL_NAME}.tgz -C ${D}${root_prefix} lib
                ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz
        fi
 
-       for imageType in ${KERNEL_IMAGETYPES} ; do
-               base_name=${imageType}-${KERNEL_IMAGE_NAME}
-               symlink_name=${imageType}-${KERNEL_IMAGE_LINK_NAME}
-               ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
-               ln -sf ${base_name}.bin $deployDir/${imageType}
-       done
-
        if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
                for imageType in ${KERNEL_IMAGETYPES} ; do
                        initramfs_base_name=${imageType}-${INITRAMFS_NAME}