diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-08-19 22:16:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-21 14:49:42 +0100 |
commit | f09947586c5c2c05368651838fea970808ab161d (patch) | |
tree | 30ba4b362c6ff6abeccb2527dcc494540b8c87d1 /meta/classes/kernel.bbclass | |
parent | d0a8532abbd86841f50d36407b5f4f8a84285bcd (diff) | |
download | poky-f09947586c5c2c05368651838fea970808ab161d.tar.gz |
kernel*.bbclass: rename *_SYMLINK_NAME variables to *_LINK_NAME and *_BASE_NAME to *_NAME
* for consistency with IMAGE_NAME and IMAGE_LINK_NAME
and to avoid confusion with IMAGE_BASENAME (which is the
actual name of the artifact, e.g. PN while KERNEL_IMAGE_BASE_NAME
was only the version suffix)
(From OE-Core rev: f952c8e08b4798aa0f8bf764cfd70bda0eae9b8b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel.bbclass')
-rw-r--r-- | meta/classes/kernel.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 42efa382ad..e47c063f5a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -667,26 +667,26 @@ kernel_do_deploy() { | |||
667 | fi | 667 | fi |
668 | 668 | ||
669 | for type in ${KERNEL_IMAGETYPES} ; do | 669 | for type in ${KERNEL_IMAGETYPES} ; do |
670 | base_name=${type}-${KERNEL_IMAGE_BASE_NAME} | 670 | base_name=${type}-${KERNEL_IMAGE_NAME} |
671 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin | 671 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin |
672 | done | 672 | done |
673 | if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then | 673 | if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then |
674 | mkdir -p ${D}/lib | 674 | mkdir -p ${D}/lib |
675 | tar -cvzf $deployDir/${MODULE_TARBALL_BASE_NAME} -C ${D} lib | 675 | tar -cvzf $deployDir/${MODULE_TARBALL_NAME} -C ${D} lib |
676 | ln -sf ${MODULE_TARBALL_BASE_NAME} $deployDir/${MODULE_TARBALL_SYMLINK_NAME} | 676 | ln -sf ${MODULE_TARBALL_NAME} $deployDir/${MODULE_TARBALL_LINK_NAME} |
677 | fi | 677 | fi |
678 | 678 | ||
679 | for type in ${KERNEL_IMAGETYPES} ; do | 679 | for type in ${KERNEL_IMAGETYPES} ; do |
680 | base_name=${type}-${KERNEL_IMAGE_BASE_NAME} | 680 | base_name=${type}-${KERNEL_IMAGE_NAME} |
681 | symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME} | 681 | symlink_name=${type}-${KERNEL_IMAGE_LINK_NAME} |
682 | ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin | 682 | ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin |
683 | ln -sf ${base_name}.bin $deployDir/${type} | 683 | ln -sf ${base_name}.bin $deployDir/${type} |
684 | done | 684 | done |
685 | 685 | ||
686 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then | 686 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then |
687 | for type in ${KERNEL_IMAGETYPES} ; do | 687 | for type in ${KERNEL_IMAGETYPES} ; do |
688 | initramfs_base_name=${type}-${INITRAMFS_BASE_NAME} | 688 | initramfs_base_name=${type}-${INITRAMFS_NAME} |
689 | initramfs_symlink_name=${type}-${INITRAMFS_SYMLINK_NAME} | 689 | initramfs_symlink_name=${type}-${INITRAMFS_LINK_NAME} |
690 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin | 690 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin |
691 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin | 691 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin |
692 | done | 692 | done |