diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-27 20:04:37 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-07 14:07:16 +0200 |
| commit | 5fe0cebd4347eb19e9cf47ba4dd3803e929402cd (patch) | |
| tree | 1d0d553a7f0ea1d178374f2e7bc5cc4d10d3126e | |
| parent | 7bc9bf1672465ed84c4713513a430e9e2ebb3f12 (diff) | |
image_type_tezi: use the new version variables
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | classes/image_type_tezi.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 9cca637..5153423 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -30,11 +30,11 @@ python rootfs_tezi_json() { data = OrderedDict({ "config_format": 1, "autoinstall": False }) - # Use image recipies SUMMARY/DESCRIPTION/PV... + # Use image recipes SUMMARY/DESCRIPTION/PV... data["name"] = d.getVar('SUMMARY', True) data["description"] = d.getVar('DESCRIPTION', True) - data["version"] = d.getVar('PV', True) - data["release_date"] = date.isoformat(date.today()) + data["version"] = d.getVar('TDX_VER_EXT_MIN', True) + data["release_date"] = d.getVar('TDX_VERDATE', True)[1:9] if os.path.exists(os.path.join(deploydir, "prepare.sh")): data["prepare_script"] = "prepare.sh" if os.path.exists(os.path.join(deploydir, "wrapup.sh")): @@ -123,7 +123,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}. - ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}_${PV}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${U_BOOT_BINARY} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.tar.xz + ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}_${TDX_VER_EXT}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${U_BOOT_BINARY} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.tar.xz } IMAGE_TYPEDEP_teziimg += "tar.xz" |