summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-09-16 14:54:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-17 09:47:45 +0100
commit89c123119ba1b49e2507c547409eaca3d5e353ce (patch)
tree5e1f1bc7e6a89aa6ad20ef01a3f55f5e958d1396 /meta/classes
parent43f1cf2d3d4b35b0bcd4bc9a4f464341af5f97dd (diff)
downloadpoky-89c123119ba1b49e2507c547409eaca3d5e353ce.tar.gz
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] (From OE-Core rev: 9a16dc2ac3d5e8ea95a575c377d3ad1602c1db12) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 14c22da306..10e734a19e 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -407,7 +407,7 @@ kernel_do_install() {
407 install -d ${D}/${KERNEL_IMAGEDEST} 407 install -d ${D}/${KERNEL_IMAGEDEST}
408 install -d ${D}/boot 408 install -d ${D}/boot
409 for imageType in ${KERNEL_IMAGETYPES} ; do 409 for imageType in ${KERNEL_IMAGETYPES} ; do
410 install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} 410 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
411 done 411 done
412 install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} 412 install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
413 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} 413 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
@@ -716,11 +716,11 @@ kernel_do_deploy() {
716 fi 716 fi
717 717
718 for imageType in ${KERNEL_IMAGETYPES} ; do 718 for imageType in ${KERNEL_IMAGETYPES} ; do
719 base_name=${imageType}-${KERNEL_IMAGE_NAME} 719 base_name=$imageType-${KERNEL_IMAGE_NAME}
720 install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin 720 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$base_name.bin
721 symlink_name=${imageType}-${KERNEL_IMAGE_LINK_NAME} 721 symlink_name=$imageType-${KERNEL_IMAGE_LINK_NAME}
722 ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin 722 ln -sf $base_name.bin $deployDir/$symlink_name.bin
723 ln -sf ${base_name}.bin $deployDir/${imageType} 723 ln -sf $base_name.bin $deployDir/$imageType
724 done 724 done
725 725
726 if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 726 if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
@@ -741,10 +741,10 @@ kernel_do_deploy() {
741 if [ "$imageType" = "fitImage" ] ; then 741 if [ "$imageType" = "fitImage" ] ; then
742 continue 742 continue
743 fi 743 fi
744 initramfs_base_name=${imageType}-${INITRAMFS_NAME} 744 initramfs_base_name=$imageType-${INITRAMFS_NAME}
745 initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME} 745 initramfs_symlink_name=$imageType-${INITRAMFS_LINK_NAME}
746 install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin 746 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfs_base_name.bin
747 ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin 747 ln -sf $initramfs_base_name.bin $deployDir/$initramfs_symlink_name.bin
748 done 748 done
749 fi 749 fi
750} 750}