On Thu, 10 Aug 2023 at 14:39, Frederic Martinsons via lists.openembedded.org <[email protected]> wrote:
> 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 > Signed-off-by: Abdellatif El Khlifi <[email protected]> > Signed-off-by: Richard Purdie <[email protected]> > (cherry picked from commit 1b67fd9ac74935fa41e960478c54e45422339138) > Signed-off-by: Frederic Martinsons <[email protected]> > --- > meta/classes/kernel.bbclass | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index c6310d8de7..5d8b3b062a 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -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 > + # 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 > + # generated yet. > + # After the generation of the fitImage, the deploy task copies the > fitImage from the build directory to > + # the deploy folder. > + # > + > for imageType in ${KERNEL_IMAGETYPES} ; do > - install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} > ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} > - 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} > + if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then > + ln -sf ${imageType}-${KERNEL_VERSION} > ${D}/${KERNEL_IMAGEDEST}/${imageType} > + 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} > -- > 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 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185742): https://lists.openembedded.org/g/openembedded-core/message/185742 Mute This Topic: https://lists.openembedded.org/mt/100662341/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
