summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Woestenberg <leon@sidebranch.com>2018-09-10 23:56:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 07:42:28 +0100
commitc2d00e2f83cdf3d2923660448756ed29296a06a6 (patch)
tree38091fc2b19b1b31cdc1db794fd2872b7f8c9019
parentbb05e37d57465378296fa119c73bd50cf979cbcb (diff)
downloadpoky-c2d00e2f83cdf3d2923660448756ed29296a06a6.tar.gz
kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
kernel-fitimage.bbclass replaces an occurance of "fitImage" in KERNEL_IMAGETYPE_FOR_MAKE by an image type that is buildable for the architecture (such as zImage). The kernel-fitimage.bbclass packs that image as sub-image in a flattened image tree image (fitImage) and deploys this fitImage along with the image tree source file (.its). kernel-fitimage.bbclass does not alter KERNEL_IMAGETYPES, which thus also contains "fitImage", which kernel.bbclass will also deploy redundantly with different naming. The result is a dual deployment with slightly different naming, each with a set of symlinks. The solution chosen is to have fitImage deployment be handled by kernel-fitimage.bbclass, and have kernel.bbclass ignore fitImage types during deployment. (From OE-Core rev: 65cded55fa96b1ba72149a31689c081ac27af7f7) Signed-off-by: Leon Woestenberg <leon@sidebranch.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass18
1 files changed, 12 insertions, 6 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6b734be2b6..bfb4243969 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -667,8 +667,11 @@ kernel_do_deploy() {
667 fi 667 fi
668 668
669 for imageType in ${KERNEL_IMAGETYPES} ; do 669 for imageType in ${KERNEL_IMAGETYPES} ; do
670 base_name=${imageType}-${KERNEL_IMAGE_NAME} 670 # kernel-fitimage class deploys fitImages, skip here
671 install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin 671 if [ "$imageType" != "fitImage" ]; then
672 base_name=${imageType}-${KERNEL_IMAGE_NAME}
673 install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
674 fi
672 done 675 done
673 if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 676 if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
674 mkdir -p ${D}/lib 677 mkdir -p ${D}/lib
@@ -685,10 +688,13 @@ kernel_do_deploy() {
685 688
686 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then 689 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
687 for imageType in ${KERNEL_IMAGETYPES} ; do 690 for imageType in ${KERNEL_IMAGETYPES} ; do
688 initramfs_base_name=${imageType}-${INITRAMFS_NAME} 691 # kernel-fitimage class deploys fitImages, skip here
689 initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME} 692 if [ "$imageType" != "fitImage" ]; then
690 install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin 693 initramfs_base_name=${imageType}-${INITRAMFS_NAME}
691 ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin 694 initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
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
692 done 698 done
693 fi 699 fi
694} 700}