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

[YOCTO #12937]

Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
---
 meta/classes/kernel.bbclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index bd7f7131a4..8046a69d83 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -371,9 +371,9 @@ 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}
                if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then
-                       ln -sf ${imageType}-${KERNEL_VERSION} 
${D}/${KERNEL_IMAGEDEST}/${imageType}
+                       ln -sf $imageType-${KERNEL_VERSION} 
${D}/${KERNEL_IMAGEDEST}/$imageType
                fi
        done
        install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
@@ -681,8 +681,8 @@ kernel_do_deploy() {
        fi
 
        for imageType in ${KERNEL_IMAGETYPES} ; do
-               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} 
$deployDir/${imageType}-${KERNEL_IMAGE_NAME}.bin
-               ln -sf ${imageType}-${KERNEL_IMAGE_NAME}.bin 
$deployDir/${imageType}
+               install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType 
$deployDir/$imageType-${KERNEL_IMAGE_NAME}.bin
+               ln -sf $imageType-${KERNEL_IMAGE_NAME}.bin $deployDir/$imageType
        done
 
        if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e 
'^CONFIG_MODULES=y$' .config); then
@@ -695,7 +695,7 @@ kernel_do_deploy() {
                        if [ "$imageType" = "fitImage" ] ; then
                                continue
                        fi
-                       install -m 0644 
${KERNEL_OUTPUT_DIR}/${imageType}.initramfs 
$deployDir/${imageType}-${INITRAMFS_NAME}.bin
+                       install -m 0644 
${KERNEL_OUTPUT_DIR}/$imageType.initramfs 
$deployDir/$imageType-${INITRAMFS_NAME}.bin
                done
        fi
 }
@@ -713,7 +713,7 @@ kernel_do_deploy_links() {
        fi
 
        for imageType in ${KERNEL_IMAGETYPES} ; do
-               ln -vf $deployDir/${imageType}-${KERNEL_IMAGE_NAME}.bin 
$deployDir/${imageType}-${KERNEL_IMAGE_LINK_NAME}.bin
+               ln -vf $deployDir/$imageType-${KERNEL_IMAGE_NAME}.bin 
$deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin
        done
 
        if [ ${MODULE_TARBALL_DEPLOY} = "1" -a -f 
$deployDir/modules-${MODULE_TARBALL_NAME}.tgz ] ; then
@@ -725,7 +725,7 @@ kernel_do_deploy_links() {
                        if [ "$imageType" = "fitImage" ] ; then
                                continue
                        fi
-                       ln -vf $deployDir/${imageType}-${INITRAMFS_NAME}.bin 
$deployDir/${imageType}-${INITRAMFS_LINK_NAME}.bin
+                       ln -vf $deployDir/$imageType-${INITRAMFS_NAME}.bin 
$deployDir/$imageType-${INITRAMFS_LINK_NAME}.bin
                done
        fi
 }
-- 
2.17.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to