summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAbdellatif El Khlifi <abdellatif.elkhlifi@arm.com>2021-01-19 10:53:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-20 00:45:05 +0000
commitaf6ac324379d8e2c85940b401d488d4d4d0cde94 (patch)
treeae0b9ce6edf1b7119f2b237afcda73386b2fb43e /meta/classes
parent8a2f4e143b52109fbd0ee8d792e327d460b8c1e6 (diff)
downloadpoky-af6ac324379d8e2c85940b401d488d4d4d0cde94.tar.gz
kernel: skip installing fitImage when using Initramfs bundles
When including an initramfs bundle inside a FIT image, the fitImage is created after the install task by do_assemble_fitimage_initramfs. This happens after the generation of the initramfs bundle (done by do_bundle_initramfs). So, at the level of the install task we should not try to install the fitImage. The fitImage is still not generated yet. After the generation of the fitImage, the deploy task copies the fitImage from the build directory to the deploy folder. Change-Id: I3eaa6bba1412f388f710fa0f389f66631c1c4826 (From OE-Core rev: 1b67fd9ac74935fa41e960478c54e45422339138) Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass16
1 files changed, 15 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 2f1006ddf0..ddff2ddcd2 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -415,9 +415,23 @@ kernel_do_install() {
415 # 415 #
416 install -d ${D}/${KERNEL_IMAGEDEST} 416 install -d ${D}/${KERNEL_IMAGEDEST}
417 install -d ${D}/boot 417 install -d ${D}/boot
418
419 #
420 # When including an initramfs bundle inside a FIT image, the fitImage is created after the install task
421 # by do_assemble_fitimage_initramfs.
422 # This happens after the generation of the initramfs bundle (done by do_bundle_initramfs).
423 # So, at the level of the install task we should not try to install the fitImage. fitImage is still not
424 # generated yet.
425 # After the generation of the fitImage, the deploy task copies the fitImage from the build directory to
426 # the deploy folder.
427 #
428
418 for imageType in ${KERNEL_IMAGETYPES} ; do 429 for imageType in ${KERNEL_IMAGETYPES} ; do
419 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION} 430 if [ $imageType != "fitImage" ] || [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then
431 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
432 fi
420 done 433 done
434
421 install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} 435 install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
422 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} 436 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
423 install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} 437 install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}