]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel.bbclass: Fix incorrect deploying of fitimage.initramfs
authorManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Thu, 3 Jan 2019 16:53:22 +0000 (08:53 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 28 Jan 2019 16:56:32 +0000 (16:56 +0000)
When kernel-fitimage and initramfs is enabled using
INITRAMFS_IMAGE_BUNDLE = "1", kernel do_deploy tries to deploy
fitImage.initramfs with following error

| install: cannot stat 'arch/arm64/boot/fitImage.initramfs': No such
file or directory

Skip deploying fitimage.initramfs, since fitimage does not
create fitimage.initramfs

(From OE-Core rev: 0f87f8522a2c1b5a7042738887952b98060fbd9d)

Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/classes/kernel.bbclass

index 2e4ed8d3aff414a74ea759b17909fdb68a634077..45cb4fabc1855447255a5743790017a360eed192 100644 (file)
@@ -682,6 +682,9 @@ kernel_do_deploy() {
 
        if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
                for imageType in ${KERNEL_IMAGETYPES} ; do
+                       if [ "$imageType" = "fitImage" ] ; then
+                               continue
+                       fi
                        initramfs_base_name=${imageType}-${INITRAMFS_NAME}
                        initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
                        install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin