From 1d2184eed168f8e43309c038dece31219d3463f6 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Mon, 27 Mar 2017 20:17:02 +0200
Subject: trdx-image-fstype: use the new version variables

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 recipes-images/images/trdx-image-fstype.inc | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'recipes-images')

diff --git a/recipes-images/images/trdx-image-fstype.inc b/recipes-images/images/trdx-image-fstype.inc
index 2733d4f..db4e1fb 100644
--- a/recipes-images/images/trdx-image-fstype.inc
+++ b/recipes-images/images/trdx-image-fstype.inc
@@ -1,7 +1,10 @@
 #create the deployment directory-tree
 
+include conf/tdx_version.conf
+
 BURNFLASH := "${THISDIR}/files/${MACHINE}"
-IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_NAME}${PV}/rootfs"
+IMAGE_DIR = "${IMAGE_NAME}_${PV}"
+IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs"
 
 U_BOOT_EXT = "bin"
 U_BOOT_EXT_mx6 = "imx"
@@ -19,7 +22,6 @@ U_BOOT_BINARY_tegra124m = "u-boot-dtb-tegra.${U_BOOT_EXT}"
 #we need some native tools for deployment
 DEPENDS_append_mx6 = " imx-loader-native"
 DEPENDS_append_mx7 = " mtd-utils-native imx-loader-native"
-#FIXME: 32-bit tegrarcm built on F20 does not run on 64-bit F20 even with properly installed 32-bit libs!
 DEPENDS_append_tegra = " cbootimage-native tegrarcm-native"
 DEPENDS_append_tegra124 = " cbootimage-native tegrarcm-native"
 DEPENDS_append_tegra124m = " cbootimage-native tegrarcm-native"
@@ -130,9 +132,9 @@ fakeroot imagedeploy() {
 
 fakeroot imagedeploy_arm() {
     cd ${WORKDIR}
-    cp -Lr ${BURNFLASH}/* ${IMAGE_NAME}${PV}/
+    cp -Lr ${BURNFLASH}/* ${IMAGE_DIR}/
 
-    cd ${IMAGE_NAME}${PV}/${MACHINE}_bin
+    cd ${IMAGE_DIR}/${MACHINE}_bin
     ./mk-u-boot-scripts.sh
     cd ${WORKDIR}
 
@@ -147,21 +149,24 @@ fakeroot imagedeploy_arm() {
     mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/${U_BOOT_SYMLINK} ${IMAGE_ROOTFS}/../${MACHINE}_bin/${U_BOOT_BINARY}
 
     # add the rootfs version to the welcome banner
-    echo "${IMAGE_NAME}${PV}_${DATE}" >> ${IMAGE_ROOTFS}/etc/issue
+    echo -n "${IMAGE_NAME} ${PV}" >> ${IMAGE_ROOTFS}/etc/issue
+    echo " ${TDX_VERDATE}" | sed 's/-//' >> ${IMAGE_ROOTFS}/etc/issue
     echo "" >> ${IMAGE_ROOTFS}/etc/issue
 
     # add additional tools if required
     imagedeploytools
 
     # remove intermediate file rootfs.lock
-    rm -f ${IMAGE_NAME}${PV}/rootfs.lock
+    rm -f ${IMAGE_DIR}/rootfs.lock
 
     #create tarball
-    tar -cjf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${PV}_${DATE}.tar.bz2 ${IMAGE_NAME}${PV}
+    tar -cjf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}_${TDX_VER_EXT}.tar.bz2 ${IMAGE_DIR}
 }
 
 fakeroot do_imagedeploy() {
     imagedeploy
 }
 addtask imagedeploy after do_rootfs before do_image_complete
-do_imagedeploy[vardepsexclude] = "DATE"
+
+# make sure to rerun do_rootfs before do_imagedeploy is executed
+do_imagedeploy[vardep] = "do_rootfs"
-- 
cgit v1.2.3