diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/kernel.bbclass | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index bfb4243969..6b734be2b6 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -667,11 +667,8 @@ kernel_do_deploy() { | |||
667 | fi | 667 | fi |
668 | 668 | ||
669 | for imageType in ${KERNEL_IMAGETYPES} ; do | 669 | for imageType in ${KERNEL_IMAGETYPES} ; do |
670 | # kernel-fitimage class deploys fitImages, skip here | 670 | base_name=${imageType}-${KERNEL_IMAGE_NAME} |
671 | if [ "$imageType" != "fitImage" ]; then | 671 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin |
672 | base_name=${imageType}-${KERNEL_IMAGE_NAME} | ||
673 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin | ||
674 | fi | ||
675 | done | 672 | done |
676 | 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 |
677 | mkdir -p ${D}/lib | 674 | mkdir -p ${D}/lib |
@@ -688,13 +685,10 @@ kernel_do_deploy() { | |||
688 | 685 | ||
689 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then | 686 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then |
690 | for imageType in ${KERNEL_IMAGETYPES} ; do | 687 | for imageType in ${KERNEL_IMAGETYPES} ; do |
691 | # kernel-fitimage class deploys fitImages, skip here | 688 | initramfs_base_name=${imageType}-${INITRAMFS_NAME} |
692 | if [ "$imageType" != "fitImage" ]; then | 689 | initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME} |
693 | initramfs_base_name=${imageType}-${INITRAMFS_NAME} | 690 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin |
694 | initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME} | 691 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin |
695 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin | ||
696 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin | ||
697 | fi | ||
698 | done | 692 | done |
699 | fi | 693 | fi |
700 | } | 694 | } |