kernel.bbclass: use bash variables like imageType, base_name without {}

* just to make sure it looks like bash variable not bitbake variable in
  run.do_* scripts

[YOCTO #12937]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 14c22da306d641a98c3dd64117a23eba418c53a0..10e734a19e85dc668f37ce21d6aa6285ad41f0bb 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -407,7 +407,7 @@ kernel_do_install() {
        install -d ${D}/${KERNEL_IMAGEDEST}
        install -d ${D}/boot
        for imageType in ${KERNEL_IMAGETYPES} ; do
-               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION}
+               install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
        done
        install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
        install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
@@ -716,11 +716,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
-               symlink_name=${imageType}-${KERNEL_IMAGE_LINK_NAME}
-               ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
-               ln -sf ${base_name}.bin $deployDir/${imageType}
+               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
@@ -741,10 +741,10 @@ kernel_do_deploy() {
                        if [ "$imageType" = "fitImage" ] ; then
                                continue
                        fi
-                       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
+                       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
                done
        fi
 }