From 968899781e36f3ca23d02de28c89944a79ef5be6 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 22 Nov 2012 16:00:42 +0100
Subject: burnflash: - prepare for T30 launch - put the rootfs version in the
 login banner /etc/issue

---
 recipes/images/trdx-image-fstype.inc | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'recipes')

diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc
index 2ffb8f4..1a84270 100644
--- a/recipes/images/trdx-image-fstype.inc
+++ b/recipes/images/trdx-image-fstype.inc
@@ -1,8 +1,12 @@
 #create the deployment directory-tree
 
-BURNFLASH := "${THISDIR}/files/burnflash.tar.bz2"
+BURNFLASH := "${THISDIR}/files/${MACHINE}/burnflash.tar.bz2"
 S = "${WORKDIR}/burnflash"
-IMAGE_ROOTFS = "${WORKDIR}/T20_LinuxImage${PV}/rootfs"
+IMAGE_NAME_colibri-t20 = "T20_LinuxImage"
+IMAGE_NAME_colibri-t30 = "T30_LinuxImage"
+IMAGE_NAME_colibri-pxa = "PXA_LinuxImage"
+
+IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_NAME}${PV}/rootfs"
 
 do_rootfs_prepend() {
     tar -C ${WORKDIR} -xf ${BURNFLASH} 
@@ -17,10 +21,14 @@ do_rootfs_append() {
     mv ${IMAGE_ROOTFS}/../bin/uImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../bin/uImage
 
     cp -pP ${DEPLOY_DIR_IMAGE}/u-boot* ${IMAGE_ROOTFS}/../bin/
-    rm ${IMAGE_ROOTFS}/../bin/u-boot-hsmmc-${MACHINE}.bin
+    rm -f ${IMAGE_ROOTFS}/../bin/u-boot-hsmmc-${MACHINE}.bin
     mv ${IMAGE_ROOTFS}/../bin/u-boot-${MACHINE}.bin ${IMAGE_ROOTFS}/../bin/u-boot.bin
 
+    # add the rootfs version to the welcome banner
+    echo "${IMAGE_NAME}${PV}_${DATE}" >> /etc/issue
+    echo "" >> /etc/issue
+
     #create tarball
     DATE=`date +%Y%m%d`
-    cd ${WORKDIR}; tar -cjvf ${DEPLOY_DIR_IMAGE}/T20_LinuxImage${PV}_${DATE}.tar.bz2 T20_LinuxImage${PV}
+    cd ${WORKDIR}; tar -cjvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${PV}_${DATE}.tar.bz2 ${IMAGE_NAME}${PV}
 }
-- 
cgit v1.2.3