From 4c29f9a6fbe37a7f8bcda64a0694bd2ac1334340 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Mon, 30 Nov 2015 15:15:33 +0200
Subject: Create .img binary image for all devices

Use the sdcard bbclass from meta-fsl-arm to build binary image
for TI hardware. Append all other image creation functions to
create the .img symlink.

Change-Id: I1bb0b5ea893789831d6fae27ece93ce238bfcb49
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 scripts/manifest.xml      |  2 +-
 scripts/manifest_fido.xml |  2 +-
 scripts/upload.sh         | 12 ++++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 53ed620..6e356ab 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -29,7 +29,7 @@
            remote="yocto"
            revision="f30b056c8f1af3f3122f94dbaa4698da5d620a41"
            path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex,architech"/>
+           groups="notdefault,fsl,toradex,architech,ti,bbb"/>
   <project name="meta-ti"
            remote="yocto"
            revision="0a222c70845d19a2213ac36803361e8531768cca"
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml
index 720d7d1..9bd0510 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_fido.xml
@@ -29,7 +29,7 @@
            remote="yocto"
            revision="fido"
            path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex,architech"/>
+           groups="notdefault,fsl,toradex,architech,ti,bbb"/>
   <project name="meta-ti"
            remote="yocto"
            revision="fido"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 2da1f08..3df3b3e 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,8 +31,8 @@ if [ ${AUTOMOTIVE} = "true" ]; then
   scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-x86_64-automotive-toolchain-${MACHINE}.sh
   if [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.hdd ]; then
     scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.hdd ${UPLOADPATH}/
-  elif [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.sdcard ]; then
-    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.sdcard ${UPLOADPATH}/b2qt-automotive-qt5-image-${MACHINE}.img
+  elif [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ]; then
+    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ${UPLOADPATH}/
   fi
   exit 0
 fi
@@ -61,10 +61,6 @@ scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh $
 
 if [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hdd ]; then
   scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hdd ${UPLOADPATH}/
-elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.sdcard ]; then
-  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.sdcard ${UPLOADPATH}/b2qt-embedded-qt5-image-${MACHINE}.img
-elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.rpi-sdimg ]; then
-  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.rpi-sdimg ${UPLOADPATH}/b2qt-embedded-qt5-image-${MACHINE}.img
-elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hddimg ]; then
-  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hddimg ${UPLOADPATH}/b2qt-embedded-qt5-image-${MACHINE}.img
+elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.img ]; then
+  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.img ${UPLOADPATH}/
 fi
-- 
cgit v1.2.3-54-g00ecf