]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel.bbclass: fix deployment for initramfs images
authorAwais Belal <Awais_Belal@mentor.com>
Fri, 29 Jan 2021 12:42:39 +0000 (17:42 +0500)
committerSteve Sakoman <steve@sakoman.com>
Thu, 4 Feb 2021 14:57:53 +0000 (04:57 -1000)
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.

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>
meta/classes/kernel.bbclass

index 2a65c001d97ee465ed42eec57f285b5a64aa78b9..83a574efcd9a1a9b2d2a790292c80a88d2274c30 100644 (file)
@@ -718,7 +718,7 @@ kernel_do_deploy() {
        fi
 
        if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
-               for imageType in ${KERNEL_IMAGETYPES} ; do
+               for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
                        if [ "$imageType" = "fitImage" ] ; then
                                continue
                        fi