summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAwais Belal <Awais_Belal@mentor.com>2021-01-29 17:42:39 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-10 23:55:53 +0000
commit6ccf96578a683bef63ab6857d9122e74b0910ed8 (patch)
tree15c44bec76dd5a01c66c748ad1ce15ab924687c7
parentc5488d7f2c6b494358a89bbab2a59e6772c1b9c3 (diff)
downloadpoky-6ccf96578a683bef63ab6857d9122e74b0910ed8.tar.gz
kernel.bbclass: fix deployment for initramfs images
The do_bundle_initramfs() only processes kernel image types that are found in KERNEL_IMAGETYPE_FOR_MAKE whereas the build system can generate other types that are not directly supported by the kernel build system. In which case when we come to the deploy phase not all the images mentioned in KERNEL_IMAGETYPES would have a respective initramfs bundled image. An example is using vmlinux.gz in KERNEL_IMAGETYPES and enabling initramfs and then we see install: cannot stat 'arch/arm64/boot/vmlinux.gz.initramfs': No such file or directory So we align the deploy phase with bundle initramfs phase and pick up relevant initramfs bundled images using KERNEL_IMAGETYPE_FOR_MAKE instead of KERNEL_IMAGETYPES. (From OE-Core rev: 352cecca98a0a845e1dacd10e399e26cdf8c7a93) Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 526bdd88ccd758204452579333ba188e29270bde) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 2a65c001d9..83a574efcd 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -718,7 +718,7 @@ kernel_do_deploy() {
718 fi 718 fi
719 719
720 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then 720 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
721 for imageType in ${KERNEL_IMAGETYPES} ; do 721 for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
722 if [ "$imageType" = "fitImage" ] ; then 722 if [ "$imageType" = "fitImage" ] ; then
723 continue 723 continue
724 fi 724 fi