Skip to contentSkip to conversation

] kernel: skip installing fitImage when using Initramfs bundles

OE-core Frédéric Martinsons 1 participant 1 message Aug 10, 2023 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Quoted 70 lines · Frederic Martinsons via lists.openembedded.org

From: Abdellatif El Khlifi <[email protected]>

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
(cherry picked from commit 1b67fd9ac74935fa41e960478c54e45422339138)
---
 meta/classes/kernel.bbclass | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +3 -0
index c6310d8de7..5d8b3b062a 100644
@@ -417,12 +417,26 @@ kernel_do_install() {
        #
        install -d ${D}/${KERNEL_IMAGEDEST}
        install -d ${D}/boot
+
+       #
+       # When including an initramfs bundle inside a FIT image, the

fitImage is created after the install task

meta/classes/kernel.bbclass +2 -0
+       # 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. fitImage is still not

meta/classes/kernel.bbclass +2 -0
+       # generated yet.
+       # After the generation of the fitImage, the deploy task copies the

fitImage from the build directory to

meta/classes/kernel.bbclass +3 -1
+       # the deploy folder.
+       #
+
        for imageType in ${KERNEL_IMAGETYPES} ; do
-               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}

${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION}

meta/classes/kernel.bbclass +0 -2
-               if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then
-                       ln -sf ${imageType}-${KERNEL_VERSION}

${D}/${KERNEL_IMAGEDEST}/${imageType}
+ if [ $imageType != "fitImage" ] || [
"${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then
+ install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}
${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION}

meta/classes/kernel.bbclass +2 -0
+                       if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then
+                               ln -sf ${imageType}-${KERNEL_VERSION}

${D}/${KERNEL_IMAGEDEST}/${imageType}

meta/classes/kernel.bbclass +2 -1
+                       fi
                fi
        done
+
        install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
        install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
        install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
--
Quoted 4 lines

2.34.1

You can know more about the reason of this submission for dunfell backport into https://lists.openembedded.org/g/openembedded-core/topic/100638982

-=-=-=-=-=-=-=-=-=-=-=-

Quoted 10 lines

Links: You receive all messages sent to this group. View/Reply Online (#185741):
https://lists.openembedded.org/g/openembedded-core/message/185741
Mute This Topic: https://lists.openembedded.org/mt/100662341/6213388
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-