3 files changed, 29 insertions, 31 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index ef47bab..672b6ca 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -37,17 +37,12 @@
            remote="freescale"
            revision="af5a8cf74d488ba45715ed0b0e0441e60b10c31d"
            path="sources/meta-freescale"
-           groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3,boundary,fsl-imx8"/>
+           groups="notdefault,external,fsl,toradex,smx6,renesas-gen3,boundary,fsl-imx8"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
            revision="9613dbc02ca970122a01c935bc9e5789ced73a9d"
            path="sources/meta-freescale-3rdparty"
            groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
-  <project name="meta-ti"
-           remote="yocto"
-           revision="aca8f5d6ff8a529e00bdeae5b401c791ed6ecb2b"
-           path="sources/meta-ti"
-           groups="notdefault,external,ti"/>
   <project name="meta-raspberrypi"
            remote="yocto"
            revision="f2e2a4376e84dec6e5efeabaa86a4406fddf7dcd"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 3045e3c..44f529c 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -59,7 +59,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx8|imx8qmlpddr4arm2)
       LAYERSCONF="bblayers.conf.fsl-imx8.sample"
     ;;
-    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
+    apalis-imx6|colibri-imx6|colibri-imx6ull|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
     nitrogen6x|nitrogen7)
@@ -71,9 +71,6 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     smarc-samx6i)
       LAYERSCONF="bblayers.conf.smx6.sample"
     ;;
-    beagleboard|beaglebone|am335x-evm)
-      LAYERSCONF="bblayers.conf.ti.sample"
-    ;;
     raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
@@ -101,7 +98,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
   cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
-  if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
+  if [ -e ${PWD}/sources/meta-boot2qt/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT ]; then
     QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi
diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index bd63de8..2172c01 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,41 +28,47 @@
 ##
 ############################################################################
 
-if [ $# -ne 1 ]; then
-    echo "Usage: $0 <qt5.git>"
-    echo "Update SRCREVs for all Qt modules in the current folder."
+if [ $# -lt 1 ]; then
+    echo "Usage: $0 <qt5.git> [<layerdir>]"
+    echo "Update SRCREVs for all Qt modules in the current layer."
     echo "The <qt5.git> is path to the qt5 super repo, where modules' SHA1 is taken."
     exit 1
 fi
 
 SHA1S=$(git -C $1 submodule status --recursive |  cut -c2- | awk '{print $1$2}')
+LAYERDIR=${2:-$PWD}
 
 for S in $SHA1S; do
     SHA1=${S:0:40}
     PROJECT=${S:40}
 
     if [ "${PROJECT}" = "qtwebengine" ]; then
-        sed -i -e "/^SRCREV_qtwebengine/s/\".*\"/\"${SHA1}\"/" qtwebengine_git.bb*
-        echo "${PROJECT} -> ${SHA1}"
+        RECIPE="qtwebengine"
+        TAG="SRCREV_qtwebengine"
     elif [ "${PROJECT}" = "qtwebengine/src/3rdparty" ]; then
-        sed -i -e "/^SRCREV_chromium/s/\".*\"/\"${SHA1}\"/" qtwebengine_git.bb*
-        echo "qtwebengine (chromium) -> ${SHA1}"
+        RECIPE="qtwebengine"
+        TAG="SRCREV_chromium"
     elif [ "${PROJECT}" = "qtlocation" ]; then
-        sed -i -e "/^SRCREV_qtlocation/s/\".*\"/\"${SHA1}\"/" qtlocation_git.bb*
-        echo "qtlocation -> ${SHA1}"
+        RECIPE="qtlocation"
+        TAG="SRCREV_qtlocation"
     elif [ "${PROJECT}" = "qtlocation/src/3rdparty/mapbox-gl-native" ]; then
-        sed -i -e "/^SRCREV_qtlocation-mapboxgl/s/\".*\"/\"${SHA1}\"/" qtlocation_git.bb*
-        echo "qtlocation (mapboxgl) -> ${SHA1}"
+        RECIPE="qtlocation"
+        TAG="SRCREV_qtlocation-mapboxgl"
     elif [ "${PROJECT}" = "qtivi" ]; then
-        sed -i -e "/^SRCREV_qtivi/s/\".*\"/\"${SHA1}\"/" qtivi_git.bb*
-        echo "qtivi -> ${SHA1}"
+        RECIPE="qtivi"
+        TAG="SRCREV_qtivi"
     elif [ "${PROJECT}" = "qtivi/src/3rdparty/qface" ]; then
-        sed -i -e "/^SRCREV_qface/s/\".*\"/\"${SHA1}\"/" qtivi_git.bb*
-        echo "qtivi (qface) -> ${SHA1}"
-    elif [ "${PROJECT}" = "qtenginio" ] || [ "${PROJECT}" = "qtquick1" ] || [ "${PROJECT}" = "qtsystems" ]; then
-        echo "${PROJECT} -> ignored"
-    elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then
-        sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb*
+        RECIPE="qtivi"
+        TAG="SRCREV_qface"
+    else
+        RECIPE="${PROJECT}"
+        TAG="SRCREV"
+    fi
+
+    RECIPES=$(find ${LAYERDIR} -regextype egrep -regex ".*/(nativesdk-)?${RECIPE}(-native)?_git.bb(append)?")
+
+    if [ "${RECIPES}" != "" ]; then
+        sed -i -e "/^${TAG}/s/\".*\"/\"${SHA1}\"/" ${RECIPES}
         echo "${PROJECT} -> ${SHA1}"
     else
         echo "${PROJECT} -> no recipe found"