From 5e1244928fffe8ba82218595a70fb6eda7999373 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Mon, 31 Mar 2014 17:26:15 +0200
Subject: trdx-image-fstype: deploy imx-uart for colibri-vf

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

(limited to 'recipes')

diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc
index b584c9a..f3982cc 100644
--- a/recipes/images/trdx-image-fstype.inc
+++ b/recipes/images/trdx-image-fstype.inc
@@ -14,14 +14,23 @@ do_rootfs_prepend() {
     cp -pPr ${S}/* ${IMAGE_ROOTFS}/../ 
 }
 
-#we need the native ubi tools for machines using ubifs
+#we need some native tools for deployment
 DEPENDS_colibri-vf = "mtd-utils-native imx-loader-native"
-CP_TOOLS=""
-CP_TOOLS_colibri-vf= \
-"mkdir -p ${IMAGE_ROOTFS}/../vf_flash; \
- MKUBIFS=`which mkfs.ubifs`; cp ${MKUBIFS} ${IMAGE_ROOTFS}/../vf_flash/; ${BUILD_STRIP} ${IMAGE_ROOTFS}/../vf_flash/mkfs.ubifs; \
- IMXLOADER=`which imx_uart`; cp ${IMXLOADER} ${IMAGE_ROOTFS}/../vf_flash/; ${BUILD_STRIP} ${IMAGE_ROOTFS}/../vf_flash/imx_uart; \
- IMXCONF=`dirname ${IMXLOADER}`; cp ${IMXCONF}/../../etc/imx-loader.d/*.conf ${IMAGE_ROOTFS}/../vf_flash/ "
+
+do_rootfs_append_colibri-vf() {
+    IMAGE_ROOT="${IMAGE_ROOTFS}/../vf_flash/"
+    rm -f ${IMAGE_ROOT}/mkfs.ubifs  ${IMAGE_ROOT}/imx_uart
+    mkdir -p ${IMAGE_ROOT}
+
+    # add the mkfs.ubifs binary
+    cp ${STAGING_DIR_NATIVE}/usr/sbin/mkfs.ubifs ${IMAGE_ROOT}/
+    ${BUILD_STRIP} ${IMAGE_ROOT}/mkfs.ubifs
+
+    # add imx-loader and its configuration files
+    cp ${STAGING_BINDIR_NATIVE}/imx_uart ${IMAGE_ROOT}/
+    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_uart*
+    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/* ${IMAGE_ROOT}/
+}
 
 do_rootfs_append() {
     # put u-boot, kernel into the bin directories, remove the kernel from the rootfs/boot
@@ -37,9 +46,6 @@ do_rootfs_append() {
     echo "${IMAGE_NAME}${PV}_${DATE}" >> ${IMAGE_ROOTFS}/etc/issue
     echo "" >> ${IMAGE_ROOTFS}/etc/issue
 
-    # add tools binaries if needed
-    ${CP_TOOLS}
-
     # remove intermediate file rootfs.lock
     rm ${WORKDIR}/${IMAGE_NAME}${PV}/rootfs.lock
 
-- 
cgit v1.2.3