From 6de3a976f695452c18c960c15d471d0f14262213 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 24 Feb 2021 10:39:35 +0100 Subject: image_type_tezi.bbclass: avoid installing dtb/dtbo for fitimage Devicetrees and overlays have been bundled into fitimage, so we dont have to install them to boot partition. Related-to: TOR-1700 Signed-off-by: Ming Liu (cherry picked from commit d87faee758c3b37797f0dc53e4486d5f82a48173) --- classes/image_type_tezi.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 97328f1..c10a325 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -7,7 +7,10 @@ WKS_FILE_DEPENDS_append = " tezi-metadata virtual/dtb" DEPENDS += "${WKS_FILE_DEPENDS}" -IMAGE_BOOT_FILES_append = " overlays.txt overlays/*;overlays/ " +IMAGE_BOOT_FILES_REMOVE = "${@make_dtb_boot_files(d) if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" +IMAGE_BOOT_FILES_REMOVE_apalis-tk1 = "${@ d.getVar('KERNEL_DEVICETREE') if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" +IMAGE_BOOT_FILES_append = " overlays.txt ${@'' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'overlays/*;overlays/'}" +IMAGE_BOOT_FILES_remove = "${IMAGE_BOOT_FILES_REMOVE}" RM_WORK_EXCLUDE += "${PN}" @@ -350,6 +353,7 @@ python tezi_deploy_bootfs_files() { } tezi_deploy_bootfs_files[dirs] =+ "${WORKDIR}/bootfs" tezi_deploy_bootfs_files[cleandirs] += "${WORKDIR}/bootfs" +tezi_deploy_bootfs_files[vardeps] += "IMAGE_BOOT_FILES" TAR_IMAGE_ROOTFS_task-image-bootfs = "${WORKDIR}/bootfs" IMAGE_CMD_bootfs () { -- cgit v1.2.3