]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel.bbclass: eliminate (initramfs_)symlink_name variables
authorMartin Jansa <Martin.Jansa@gmail.com>
Wed, 16 Sep 2020 12:54:47 +0000 (14:54 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 16 Sep 2020 13:01:35 +0000 (14:01 +0100)
* 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>
meta/classes/kernel.bbclass

index 10e734a19e85dc668f37ce21d6aa6285ad41f0bb..fbd295934172a46d0275fc30a0f47dc44e9540c4 100644 (file)
@@ -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
 }