diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-12-20 14:42:03 +0000 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2019-12-20 14:44:10 +0000 |
| commit | 23627c7c7a3070ba2a6f32399a9ac2831c6a9667 (patch) | |
| tree | 1ab87f0f52a36b9677036a091c471d505086a619 /classes/image_type_tezi.bbclass | |
| parent | 2d635349eff45166feb4340c3008fd2a12f354cf (diff) | |
image_type_tezi: allow custom Tezi image name
Introduce a new variable TEZI_IMAGE_NAME to allow a custom image name
for the Tezi tarball. This allows to stick with the default OpenEmbedded
image names for rootfs tarballs etc. while still following custom naming
rules for the final Tezi images.
Default to IMAGE_NAME to retain backward compatibility.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'classes/image_type_tezi.bbclass')
| -rw-r--r-- | classes/image_type_tezi.bbclass | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 0c43f90..50e7a28 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -17,6 +17,7 @@ DEPENDS += "${WKS_FILE_DEPENDS}" RM_WORK_EXCLUDE += "${PN}" TEZI_VERSION ?= "${DISTRO_VERSION}" +TEZI_IMAGE_NAME ?= "${IMAGE_NAME}" TEZI_ROOT_FSTYPE ??= "ext4" TEZI_ROOT_LABEL ??= "RFS" TEZI_ROOT_SUFFIX ??= "tar.xz" @@ -344,22 +345,22 @@ IMAGE_CMD_teziimg () { 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}_${TEZI_VERSION}. + # second transform "moves" them in a subfolder ${TEZI_IMAGE_NAME}_${TEZI_VERSION}. ${IMAGE_CMD_TAR} \ --transform='s/.*\///' \ - --transform 's,^,${IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ - -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ + --transform 's,^,${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ + -chf ${IMGDEPLOYDIR}/${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh \ ${TEZI_IMAGE_UBOOT_FILES} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE} \ ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} ;; *) # The first transform strips all folders from the files to tar, the - # second transform "moves" them in a subfolder ${IMAGE_NAME}-Tezi_${TEZI_VERSION}. + # second transform "moves" them in a subfolder ${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}. ${IMAGE_CMD_TAR} \ --transform='s/.*\///' \ - --transform 's,^,${IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ - -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ + --transform 's,^,${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ + -chf ${IMGDEPLOYDIR}/${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh \ ${TEZI_IMAGE_UBOOT_FILES} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_BOOT_SUFFIX} \ ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} @@ -410,8 +411,8 @@ IMAGE_CMD_teziimg-distro () { cd ${DEPLOY_DIR_IMAGE} ${IMAGE_CMD_TAR} \ --transform='s/.*\///' \ - --transform 's,^,${IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ - -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ + --transform 's,^,${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ + -chf ${IMGDEPLOYDIR}/${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ ${TEZI_IMAGE_JSON_FILES} toradexlinux.png marketing.tar prepare.sh wrapup.sh \ ${TEZI_IMAGE_UBOOT_FILES} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_BOOT_SUFFIX} \ ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} |