diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-16 14:54:47 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-17 09:47:45 +0100 |
commit | d1f5f2391e868df98c05fd1ee965687c01428435 (patch) | |
tree | ee8f7846faae2a5cffe29f3249e40bf1bf636071 /meta | |
parent | 89c123119ba1b49e2507c547409eaca3d5e353ce (diff) | |
download | poky-d1f5f2391e868df98c05fd1ee965687c01428435.tar.gz |
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]
(From OE-Core rev: 22874b43de45e86418f683eb9d4394d7a8a08033)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel.bbclass | 6 |
1 files changed, 2 insertions, 4 deletions
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() { | |||
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 | ln -sf $base_name.bin $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin |
722 | ln -sf $base_name.bin $deployDir/$symlink_name.bin | ||
723 | ln -sf $base_name.bin $deployDir/$imageType | 722 | ln -sf $base_name.bin $deployDir/$imageType |
724 | done | 723 | done |
725 | 724 | ||
@@ -742,9 +741,8 @@ kernel_do_deploy() { | |||
742 | continue | 741 | continue |
743 | fi | 742 | fi |
744 | initramfs_base_name=$imageType-${INITRAMFS_NAME} | 743 | initramfs_base_name=$imageType-${INITRAMFS_NAME} |
745 | initramfs_symlink_name=$imageType-${INITRAMFS_LINK_NAME} | ||
746 | install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfs_base_name.bin | 744 | 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 | 745 | ln -sf $initramfs_base_name.bin $deployDir/$imageType-${INITRAMFS_LINK_NAME}.bin |
748 | done | 746 | done |
749 | fi | 747 | fi |
750 | } | 748 | } |