4 files changed, 17 insertions, 140 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index ad454d1..3a64b21 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -6,8 +6,6 @@
   <remote fetch="git://git.yoctoproject.org" name="yocto"/>
   <remote fetch="git://git.openembedded.org" name="oe"/>
   <remote fetch="git://github.com/Freescale" name="freescale"/>
-  <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
-  <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://code.qt.io/yocto" name="qtyocto"/>
@@ -18,51 +16,41 @@
 
   <project name="poky"
            remote="yocto"
-           revision="40376446904ae3529be41737fed9a0b650ed167d"
+           revision="fc75bea445bb57e1e942b5049ee2b6e5245649ea"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="8ab04afbffb4bc5184cfe0655049de6f44269990"
+           revision="247b1267bbe95719cd4877d2d3cfbaf2a2f4865a"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="9955f170ad32bc8d6915d1dc2b6b19a8181a6363"
+           revision="f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="bf2d66bbb26afbf4c22744af925daa53f61d98e1"/>
+           revision="70e42fd678d494bf11a12cb57eff820142543159"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="c9e576bdae8c481f5a836531c7865fe8b8a5a36f"
+           revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b"
            path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
+           groups="notdefault,external,fsl,architech,ti,smx6,renesas"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
+           revision="f807c7185321fb407e82c529ddff310dc037f727"
            path="sources/meta-ti"
-           groups="notdefault,external,ti,bbb"/>
+           groups="notdefault,external,ti"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="e82417d33b8147f65141ef937d56735d80ee7207"
+           revision="2745399f75d7564fcc586d0365ff73be47849d0e"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="dd074c47af53948041f6c5671e519fbf815b0980"
+           revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e"
            path="sources/meta-fsl-arm-extra"
-           groups="notdefault,external,fsl,toradex,architech,smx6"/>
-  <project name="meta-beagleboard"
-           remote="beagleboard"
-           revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
-           path="sources/meta-beagleboard"
-           groups="notdefault,external,bbb"/>
-  <project name="meta-toradex"
-           remote="toradex"
-           revision="485643678b2d39d37b1cc9d1aa2200bb934b08de"
-           path="sources/meta-toradex"
-           groups="notdefault,external,toradex"/>
+           groups="notdefault,external,fsl,architech,smx6"/>
   <project name="meta-tibidabo"
            remote="architech"
            revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
@@ -70,12 +58,12 @@
            groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
-           revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
+           revision="b8c199201ffe026485a14e1fcfc398e2b3551512"
            path="sources/meta-intel"
            groups="notdefault,external,intel"/>
   <project name="meta-renesas"
            remote="yocto"
-           revision="b7843bd6a2835e5199cab9ba196c5e67b15acaed"
+           revision="d20e5bffb582c6bfabdadc22e903df86c8cfd66b"
            path="sources/meta-renesas"
            groups="notdefault,external,renesas"/>
 
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
deleted file mode 100644
index 829ffcb..0000000
--- a/scripts/manifest_jethro.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <default sync-j="4" revision="dizzy"/>
-
-  <remote fetch="git://git.yoctoproject.org" name="yocto"/>
-  <remote fetch="git://git.openembedded.org" name="oe"/>
-  <remote fetch="git://github.com/Freescale" name="freescale"/>
-  <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
-  <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://code.qt.io/yocto" name="qtyocto"/>
-  <remote fetch="git://git.yoctoproject.org" name="intel"/>
-  <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
-
-  <project name="poky"
-           remote="yocto"
-           revision="jethro"
-           path="sources/poky"/>
-  <project name="meta-openembedded"
-           remote="oe-mirror"
-           revision="jethro"
-           path="sources/meta-openembedded"/>
-  <project name="meta-qt5"
-           remote="qtyocto"
-           revision="5.7"
-           path="sources/meta-qt5"/>
-  <project name="meta-mingw"
-           remote="qtyocto"
-           path="sources/meta-mingw"
-           revision="jethro"/>
-
-  <project name="meta-fsl-arm"
-           remote="yocto"
-           revision="jethro"
-           path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
-  <project name="meta-ti"
-           remote="yocto"
-           revision="master"
-           path="sources/meta-ti"
-           groups="notdefault,external,ti,bbb"/>
-  <project name="meta-raspberrypi"
-           remote="yocto"
-           revision="master"
-           path="sources/meta-raspberrypi"
-           groups="notdefault,external,rpi"/>
-  <project name="meta-fsl-arm-extra"
-           remote="freescale"
-           revision="jethro"
-           path="sources/meta-fsl-arm-extra"
-           groups="notdefault,external,fsl,toradex,architech,smx6"/>
-  <project name="meta-beagleboard"
-           remote="beagleboard"
-           revision="master"
-           path="sources/meta-beagleboard"
-           groups="notdefault,external,bbb"/>
-  <project name="meta-toradex"
-           remote="toradex"
-           revision="V2.5"
-           path="sources/meta-toradex"
-           groups="notdefault,external,toradex"/>
-  <project name="meta-tibidabo"
-           remote="architech"
-           revision="dora"
-           path="sources/meta-tibidabo"
-           groups="notdefault,external,architech"/>
-  <project name="meta-intel"
-           remote="intel"
-           revision="jethro"
-           path="sources/meta-intel"
-           groups="notdefault,external,intel"/>
-  <project name="meta-renesas"
-           remote="yocto"
-           revision="master"
-           path="sources/meta-renesas"
-           groups="notdefault,external,renesas"/>
-
-  <project name="nvidia-layer"
-           remote="playground"
-           revision="master"
-           path="sources/nvidia-layer"
-           groups="notdefault,internal"/>
-  <project name="jetson-tk1-pro"
-           remote="playground"
-           revision="master"
-           path="sources/jetson-tk1-pro"
-           groups="notdefault,internal"/>
-  <project name="vibrante-t186"
-           remote="playground"
-           revision="master"
-           path="sources/vibrante-t186"
-           groups="notdefault,internal"/>
-  <project name="meta-smx6"
-           remote="playground"
-           revision="fido"
-           path="sources/meta-smx6"
-           groups="notdefault,internal"/>
-  <project name="renesas-rcar-gen2"
-           remote="playground"
-           revision="master"
-           path="sources/renesas-rcar-gen2"
-           groups="notdefault,internal"/>
-
-</manifest>
-
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 5ee1ad0..5825bf1 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -57,7 +57,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
-      LAYERSCONF="bblayers.conf.toradex.sample"
+      LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       LAYERSCONF="bblayers.conf.fsl.sample"
@@ -68,13 +68,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     tibidabo)
       LAYERSCONF="bblayers.conf.tibidabo.sample"
     ;;
-    beagleboard|am335x-evm)
+    beagleboard|beaglebone|am335x-evm)
       LAYERSCONF="bblayers.conf.ti.sample"
     ;;
-    beaglebone)
-      LAYERSCONF="bblayers.conf.bbb.sample"
-    ;;
-    raspberrypi|raspberrypi2|raspberrypi3)
+    raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
     intel-corei7-64)
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 96189ea..af7e1f2 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,7 +31,7 @@
 set -x
 set -e
 
-RELEASE=5.7
+RELEASE=5.8
 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