4 files changed, 27 insertions, 27 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 5e326c9..28ccfa3 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -17,39 +17,39 @@
 
   <project name="poky"
            remote="yocto"
-           revision="900d7d6b59c36b2bdbd1c85febec99e80ab54f95"
+           revision="b1f23d1254682866236bfaeb843c0d8aa332efc2"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="902964a4da26e46018d2a8d17dcdda1ac4627a39"
+           revision="dc5634968b270dde250690609f0015f881db81f2"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="46817620916ed6d8b8f07c720f29d1faa73eafae"
+           revision="e6897ccd0eec8fb5229e0fdd8f354292e0f49a16"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="0cfd9b1a41b38a2f7c1cfcbc2abe046e3737ae31"/>
+           revision="2844575c17f3875aa2ad0e83d600f52a1893390d"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="c9f259a4bf8472dfa3ff75f1c3fcbe5e0ded7aaf"
+           revision="8d22b44716fa624ff87383c36d222d9e28d0b267"
            path="sources/meta-fsl-arm"
            groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="0a222c70845d19a2213ac36803361e8531768cca"
+           revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
            path="sources/meta-ti"
            groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="a42a1706de91ed03ae8798c7f9e70c30cebcf7de"
+           revision="e82417d33b8147f65141ef937d56735d80ee7207"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="ad90ca98459f5de9483bb3ba5a81be0a67b078c3"
+           revision="8fdde39f732be9e1ee9505a04c579073114459e7"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
@@ -69,9 +69,9 @@
            groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
-           revision="ead0a5c115e632015d8358f4f304ec8908732f5f"
+           revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
            path="sources/meta-intel"
-           groups="notdefault,external,nuc"/>
+           groups="notdefault,external,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_jethro.xml
index be15f02..29b401c 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_jethro.xml
@@ -17,29 +17,29 @@
 
   <project name="poky"
            remote="yocto"
-           revision="fido"
+           revision="jethro"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="master-mingw"
+           revision="5.7"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="fido"/>
+           revision="jethro"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-fsl-arm"
            groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="fido"
+           revision="master"
            path="sources/meta-ti"
            groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
@@ -49,7 +49,7 @@
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
@@ -69,9 +69,9 @@
            groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-intel"
-           groups="notdefault,external,nuc"/>
+           groups="notdefault,external,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 566b708..322792f 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -51,7 +51,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx6|colibri-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)
@@ -66,14 +66,14 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     beaglebone)
       LAYERSCONF="bblayers.conf.bbb.sample"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
-    nuc)
-      LAYERSCONF="bblayers.conf.nuc.sample"
+    intel-corei7-64)
+      LAYERSCONF="bblayers.conf.intel.sample"
     ;;
-    nvidia-logan)
-      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
+    nvidia-logan|tegra-x1|tegra-t18x)
+      LAYERSCONF="bblayers.conf.nvidia.sample"
     ;;
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 2a87217..60e7e14 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -23,7 +23,7 @@
 set -x
 set -e
 
-RELEASE=5.6
+RELEASE=5.7
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
 if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then
@@ -33,7 +33,7 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf
-elif [ ${MACHINE} == "nvidia-logan" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
+elif [ ${MACHINE} == "nvidia-logan" || ${MACHINE} == "tegra-x1" || ${MACHINE} == "tegra-t18x" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \
     $PWD/tmp/deploy/images/${MACHINE}/zImage