diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2019-05-20 16:26:34 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2019-05-20 17:31:59 +0200 |
commit | 650a8bebd54c6f884be78e995aaf5f096ef2e46e (patch) | |
tree | 99fd19457ff28918c0ce2e45896c0d3959698339 | |
parent | 269708cb414bfed23526c682a31de2081a74c9c4 (diff) |
image_type_tezi: support dtbs in subdirectories
Aarch64 typically stores device trees in subdirectories, e.g.
freescale/fsl-imx8qm-apalis.dtb. However, the kernel-devicetree.bbclass
deploys those files without subdirectory. Make sure the Tezi image class
behaves like the kernel-devicetree.bbclass.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r-- | classes/image_type_tezi.bbclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 59a685b..f59d59f 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -35,8 +35,12 @@ TDX_VERDATE[vardepsexclude] = "DATE" # compression IMAGE_CMD_tar_append = "; echo $(du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar | cut -f 1) > ${T}/image-size.tar" +# Creates boot filesystem tarball create_bootfs () { - ${IMAGE_CMD_TAR} -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar -C ${DEPLOY_DIR_IMAGE} $1 + kernel_image="$1" + device_trees="$(basename -a $2)" + extra_files="$3" + ${IMAGE_CMD_TAR} -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar -C ${DEPLOY_DIR_IMAGE} ${kernel_image} ${device_trees} ${extra_files} echo $(du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar | cut -f 1) > ${T}/image-size.bootfs.tar xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar > ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz } @@ -248,7 +252,7 @@ python rootfs_tezi_run_json() { } create_tezi_bootfs () { - create_bootfs "${TEZI_KERNEL_IMAGETYPE} ${TEZI_KERNEL_DEVICETREE}" + create_bootfs "${TEZI_KERNEL_IMAGETYPE}" "${TEZI_KERNEL_DEVICETREE}" } do_image_teziimg[prefuncs] += "create_tezi_bootfs rootfs_tezi_run_json" @@ -372,7 +376,7 @@ python rootfs_tezi_run_distro_json() { } create_tezi_distro_bootfs () { - create_bootfs "${TEZI_KERNEL_IMAGETYPE} ${TEZI_KERNEL_DEVICETREE} boot.scr" + create_bootfs "${TEZI_KERNEL_IMAGETYPE}" "${TEZI_KERNEL_DEVICETREE}" "boot.scr" } do_image_teziimg_distro[prefuncs] += "create_tezi_distro_bootfs rootfs_tezi_run_distro_json" |