4 files changed, 52 insertions, 17 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 59c7804..927a2f3 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -10,29 +10,30 @@
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
+  <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
 
   <project name="poky"
            remote="yocto"
-           revision="9c4ff467f66428488b1cd9798066a8cb5d6b4c3b"
+           revision="57eb677f0efe9a4060c764e8e9dfe2440d4e5eb2"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="5b6f39ce325d490fc382d5d59c5b8b9d5fa38b38"
+           revision="214e1801d0efc38d3b6142bdc0d8e58ca593e34c"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="meta-qt5"
-           revision="89038bffd224a0d43aa8627472374503b3023f61"
+           revision="4f208863257768b875378af1421d33f1d6cf8a05"
            path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="db1571f40c375a398a8cdbb42de4c4f272ab0cd1"
+           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="6d1c337af7d43953f6d0802ffd0bf1d9d3cfb146"
+           revision="0a222c70845d19a2213ac36803361e8531768cca"
            path="sources/meta-ti"
            groups="notdefault,ti,bbb"/>
   <project name="meta-raspberrypi"
@@ -42,7 +43,7 @@
            groups="notdefault,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="794e46e0b0a3e7e270a2f3c217d8fe5751a6b2c6"
+           revision="c0ff75e85bcbd616362c21e501dc6df187612cf9"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-beagleboard"
@@ -52,7 +53,7 @@
            groups="notdefault,bbb"/>
   <project name="meta-toradex"
            remote="toradex"
-           revision="36c19b10b340983946f8f52ab7fa91d9aa1e53f6"
+           revision="eb0c16acb10257c60ddbfce8ad71448b2e987fb4"
            path="sources/meta-toradex"
            groups="notdefault,toradex"/>
   <project name="meta-tibidabo"
@@ -60,6 +61,11 @@
            revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
            path="sources/meta-tibidabo"
            groups="notdefault,architech"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="ead0a5c115e632015d8358f4f304ec8908732f5f"
+           path="sources/meta-intel"
+           groups="notdefault,nuc"/>
 
 </manifest>
 
diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_fido.xml
index 5b95985..2a1c78e 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_fido.xml
@@ -10,29 +10,30 @@
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
+  <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
 
   <project name="poky"
            remote="yocto"
-           revision="dizzy"
+           revision="fido"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="dizzy"
+           revision="fido"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="meta-qt5"
-           revision="jethro"
+           revision="master"
            path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="dizzy"
+           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="master"
+           revision="fido"
            path="sources/meta-ti"
            groups="notdefault,ti,bbb"/>
   <project name="meta-raspberrypi"
@@ -42,7 +43,7 @@
            groups="notdefault,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="dizzy"
+           revision="fido"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-beagleboard"
@@ -52,7 +53,7 @@
            groups="notdefault,bbb"/>
   <project name="meta-toradex"
            remote="toradex"
-           revision="V2.3-next"
+           revision="V2.5"
            path="sources/meta-toradex"
            groups="notdefault,toradex"/>
   <project name="meta-tibidabo"
@@ -60,6 +61,11 @@
            revision="dora"
            path="sources/meta-tibidabo"
            groups="notdefault,architech"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="fido"
+           path="sources/meta-intel"
+           groups="notdefault,nuc"/>
 
 </manifest>
 
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 683f19f..da7ec69 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -67,6 +67,9 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     raspberrypi|raspberrypi2)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
+    nuc)
+      LAYERSCONF="bblayers.conf.nuc.sample"
+    ;;
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
     ;;
diff --git a/scripts/upload.sh b/scripts/upload.sh
index f3124ee..f74da52 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -24,9 +24,20 @@
 set -x
 set -e
 
-RELEASE=5.5
+RELEASE=5.6
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
+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}.img ]; then
+    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ${UPLOADPATH}/
+    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.conf ${UPLOADPATH}/
+  fi
+  exit 0
+fi
+
 if [ ${MACHINE} = "emulator" ]; then
   cp tmp/deploy/images/emulator/b2qt-embedded-image-emulator.hdd .
   gzip b2qt-embedded-image-emulator.hdd -f
@@ -46,3 +57,12 @@ else
   scp tmp/deploy/images/${MACHINE}/b2qt-embedded-image-*${MACHINE}.tar.gz ${UPLOADPATH}/
   scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh
 fi
+
+scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-x86_64-qt5-toolchain-${MACHINE}.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}.img ]; then
+  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.img ${UPLOADPATH}/
+  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.conf ${UPLOADPATH}/
+fi