1 files changed, 30 insertions, 15 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index c9c5f46..20b3d78 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -1,24 +1,32 @@
 #!/bin/sh
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 set -e
 
@@ -98,10 +106,10 @@ get_groups() {
     all)
       PROJECT_GROUPS="external"
     ;;
-    apalis-imx6|colibri-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       PROJECT_GROUPS="toradex"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       PROJECT_GROUPS="fsl"
     ;;
     smarc-samx6i)
@@ -116,18 +124,24 @@ get_groups() {
     beaglebone)
       PROJECT_GROUPS="bbb"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       PROJECT_GROUPS="rpi"
     ;;
-    nuc)
-      PROJECT_GROUPS="nuc"
+    intel-corei7-64)
+      PROJECT_GROUPS="intel"
     ;;
     nvidia-logan)
       PROJECT_GROUPS="nvidia-logan"
     ;;
+    tegra-x1|tegra-t18x)
+      PROJECT_GROUPS="nvidia-tegra"
+    ;;
     emulator)
       PROJECT_GROUPS="emulator"
     ;;
+    alt|gose|koelsch|lager|porter|silk|stout)
+      PROJECT_GROUPS="renesas"
+    ;;
     *)
       echo "Unknown device configuration, including all meta layers"
       PROJECT_GROUPS="external"
@@ -151,7 +165,7 @@ mirror() {
   mkdir -p .repo/manifests
   cp ${DIR}/scripts/manifest.xml .repo/manifests/
   MANIFEST="manifest.xml"
-  ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror
+  ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g external --mirror
   ${REPO} sync
 }
 
@@ -182,8 +196,9 @@ init() {
     ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5
   fi
 
-  cp ${DIR}/scripts/setup-environment.sh .
-
+  if [ ! -e "setup-environment.sh" ]; then
+    ln -s ${DIR}/scripts/setup-environment.sh setup-environment.sh
+  fi
 }
 
 get_repo