summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-09-18 15:15:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-22 15:52:12 -0700
commit4a49f5f617f496bffb8334fb1a4bb90e462d924e (patch)
treea430e9234ba986796159e6f500c2349f7f0a7129
parent8e5a7658a0d4e853e53d6f829919647fda2dc687 (diff)
downloadpoky-4a49f5f617f496bffb8334fb1a4bb90e462d924e.tar.gz
Revert "kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that."
This reverts commit 65cded55fa96b1ba72149a31689c081ac27af7f7. The fitImage deployed here is the one generated in kernel-fitimage.bbclass, whereas the one deployed by kernel-fitimage.bbclass is a raw image, so we need the one deployed here keeping. (From OE-Core rev: 798d2acc0141b13da7ddd18875a417b2df9d57b3) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass18
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}