@@ -84,6 +84,10 @@ python __anonymous () {
types = (alttype + ' ' + types).strip()
d.setVar('KERNEL_IMAGETYPES', types)
+ # Since kernel-fitimage.bbclass got replaced by kernel-fit-image.bbclass
+ if "fitImage" in types:
+ bb.error("fitImage is no longer supported as a KERNEL_IMAGETYPE(S)")
+
# KERNEL_IMAGETYPES may contain a mixture of image types supported directly
# by the kernel build system and types which are created by post-processing
# the output of the kernel build system (e.g. compressing vmlinux ->
@@ -477,17 +481,10 @@ kernel_do_install() {
install -d ${D}/${KERNEL_IMAGEDEST}
#
- # 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.
+ # bundle_initramfs runs after do_install before do_deploy. do_deploy does what's needed therefore.
#
-
for imageType in ${KERNEL_IMAGETYPES} ; do
- if [ $imageType != "fitImage" ] || [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then
+ if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then
install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
fi
done
@@ -843,11 +840,8 @@ kernel_do_deploy() {
fi
fi
- if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
+ if [ -n "${INITRAMFS_IMAGE}" ] && [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
for imageType in ${KERNEL_IMAGETYPES} ; do
- if [ "$imageType" = "fitImage" ] ; then
- continue
- fi
initramfsBaseName=$imageType-${INITRAMFS_NAME}
install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfsBaseName${KERNEL_IMAGE_BIN_EXT}
if [ -n "${INITRAMFS_LINK_NAME}" ] ; then