From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 16 Sep 2020 12:54:47 +0000 (+0200)
Subject: kernel.bbclass: eliminate (initramfs_)symlink_name variables
X-Git-Tag: 2020-10-gatesgarth~202
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=22874b43de45e86418f683eb9d4394d7a8a08033;p=openembedded-core.git

kernel.bbclass: eliminate (initramfs_)symlink_name variables

* they are used only once, we can use the value directly
* notice that .bin extension isn't part of the variable values

[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 10e734a19e..fbd2959341 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -718,8 +718,7 @@ 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-${KERNEL_IMAGE_LINK_NAME}.bin
 		ln -sf $base_name.bin $deployDir/$imageType
 	done
 
@@ -742,9 +741,8 @@ kernel_do_deploy() {
 				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
+			ln -sf $initramfs_base_name.bin $deployDir/$imageType-${INITRAMFS_LINK_NAME}.bin
 		done
 	fi
 }