diff options
| author | Drew Moseley <drew.moseley@northern.tech> | 2018-08-16 20:17:54 +0000 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-09-27 15:04:27 +0200 |
| commit | 7b656ff2f24c0ddda9731bd9c38c8685e882c184 (patch) | |
| tree | b4aa4ca2689fd613a58387cdd28401387e895014 | |
| parent | 031c164fff8c068916d68a945f8f0f6e1267cc8b (diff) | |
image_type_tezi: Use IMAGE_NAME_SUFFIX variable
Use IMAGE_NAME_SUFFIX variable rather than hardcoded value .rootfs
as suffix.
Signed-off-by: Drew Moseley <drew.moseley@northern.tech>
[use Python in rootfs_tezi_(emmc|rawnand) to get image suffix]
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | classes/image_type_tezi.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 231cea4..746c8b1 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -26,6 +26,7 @@ def rootfs_tezi_emmc(d): offset_bootrom = d.getVar('OFFSET_BOOTROM_PAYLOAD', True) offset_spl = d.getVar('OFFSET_SPL_PAYLOAD', True) imagename = d.getVar('IMAGE_NAME', True) + imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True) # Calculate size of bootfs... bootfiles = [ os.path.join(deploydir, kernel) ] @@ -76,7 +77,7 @@ def rootfs_tezi_emmc(d): "label": "RFS", "filesystem_type": d.getVar('TEZI_ROOT_FSTYPE', True), "mkfs_options": "-E nodiscard", - "filename": imagename + ".rootfs.tar.xz", + "filename": imagename + imagename_suffix + ".tar.xz", "uncompressed_size": rootfs_get_size(d) / 1024 } } @@ -94,6 +95,7 @@ def rootfs_tezi_emmc(d): def rootfs_tezi_rawnand(d): from collections import OrderedDict imagename = d.getVar('IMAGE_NAME', True) + imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True) # Use device tree mapping to create product id <-> device tree relationship dtmapping = d.getVarFlags('TORADEX_PRODUCT_IDS') @@ -151,7 +153,7 @@ def rootfs_tezi_rawnand(d): "name": "rootfs", "content": { "filesystem_type": "ubifs", - "filename": imagename + ".rootfs.tar.xz", + "filename": imagename + imagename_suffix + ".tar.xz", "uncompressed_size": rootfs_get_size(d) / 1024 } } @@ -231,7 +233,7 @@ IMAGE_CMD_teziimg () { # 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}.rootfs.tar.xz + ${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 ;; *) # Create bootfs... @@ -240,7 +242,7 @@ IMAGE_CMD_teziimg () { # The first transform strips all folders from the files to tar, the # second transform "moves" them in a subfolder ${IMAGE_NAME}-Tezi_${PV}. - ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -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} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.tar.xz + ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -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} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz ;; esac } |