summaryrefslogtreecommitdiffstats
path: root/meta
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-11 17:46:12 +0000
commit5842b2920c4c9af7f680a5841c26f97880c33825 (patch)
tree38b5abe5f524e3a1f55a4b8fa72f639271ed4e1f /meta
parent0003ed2b1c286f16bbe171c2e28ab5777f82d251 (diff)
downloadpoky-5842b2920c4c9af7f680a5841c26f97880c33825.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: 327317d0162940786ae62ec3da4ae0ea73c81f48) 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: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 1a444efabf..f405b6e523 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -743,7 +743,7 @@ kernel_do_deploy() {
743 fi 743 fi
744 744
745 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then 745 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
746 for imageType in ${KERNEL_IMAGETYPES} ; do 746 for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
747 if [ "$imageType" = "fitImage" ] ; then 747 if [ "$imageType" = "fitImage" ] ; then
748 continue 748 continue
749 fi 749 fi