diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2018-10-11 13:44:59 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-03-04 17:09:51 +0100 |
| commit | d740495376ebfc267097fba460aa9edd99ed2902 (patch) | |
| tree | a2b0d71055947d7acdaecc13b5b70179b6ee472c | |
| parent | 3a8678466cd2976cc75a4e19a720a42f46fbeeec (diff) | |
image_type_tezi: use KERNEL_DEVICETREE variable directly
Now that OpenEmbedded core does not prefix dtb files names with
the type of the kernel image, we can get rid of our intermediate
KERNEL_DEVICETREE_FILES variable. Also the tar transformation
which removed kernel type prefix is no longer necessary.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | classes/image_type_tezi.bbclass | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 2a0b915..25e5ec5 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -218,38 +218,23 @@ IMAGE_CMD_teziimg () { ISODATE=`echo ${TDX_VERDATE} | sed 's/.\(....\)\(..\)\(..\).*/\1-\2-\3/'` sed -i "s/%release_date%/$ISODATE/" ${DEPLOY_DIR_IMAGE}/image.json - # Create list of device tree files - if test -n "${KERNEL_DEVICETREE}"; then - for DTS_FILE in ${KERNEL_DEVICETREE}; do - DTS_BASE_NAME=`basename ${DTS_FILE} .dtb` - if [ -e "${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb" ]; then - KERNEL_DEVICETREE_FILES="${KERNEL_DEVICETREE_FILES} ${DTS_BASE_NAME}.dtb" - else - bbfatal "${DTS_FILE} does not exist." - fi - done - fi - cd ${DEPLOY_DIR_IMAGE} case "${TORADEX_FLASH_TYPE}" in rawnand) # The first transform strips all folders from the files to tar, the # second transform "moves" them in a subfolder ${IMAGE_NAME}_${PV}. - # The third transform removes zImage from the device tree. ${IMAGE_CMD_TAR} \ --transform='s/.*\///' \ --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' \ - --transform="flags=r;s|${KERNEL_IMAGETYPE}-||" \ -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar \ - image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz + image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz ;; *) # Create bootfs... ${IMAGE_CMD_TAR} \ - --transform="flags=r;s|${KERNEL_IMAGETYPE}-||" \ -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar -C ${DEPLOY_DIR_IMAGE} \ - ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} + ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE} xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar > ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz # The first transform strips all folders from the files to tar, the |