From 3fc7fbeb76fb97ceae6763e6dccebbaa9c14c5f4 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Thu, 7 Apr 2016 08:42:48 +0300
Subject: Do not pull internal repos when initializing for all devices

When initializing build environment with '--device all', some internal
repos are fetch that are not available for customers. Now those repos
are fetched only when initializing with '--device internal'

Change-Id: I12981449d4ca9c2d3529ed81649b3cc0a1bfed02
Task-number: QTBUG-52002
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@theqtcompany.com>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 b2qt-init-build-env | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'b2qt-init-build-env')

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 90fa2b0..ddfabf6 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -90,7 +90,10 @@ get_repo() {
 get_groups() {
   case ${DEVICE} in
     all)
-      PROJECT_GROUPS="all"
+      PROJECT_GROUPS="external"
+    ;;
+    internal)
+      PROJECT_GROUPS="external internal"
     ;;
     apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
@@ -124,7 +127,7 @@ get_groups() {
     ;;
     *)
       echo "Unknown device configuration, including all meta layers"
-      PROJECT_GROUPS="all"
+      PROJECT_GROUPS="external"
     ;;
   esac
 
-- 
cgit v1.2.3-54-g00ecf


From d40aec778fc15572bb9286f324a92f61af916438 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Mon, 11 Apr 2016 12:59:21 +0300
Subject: Use --internal arg to fetch playground repos

Add separate --internal argument to get all internal repos from
playground, regardless what --device is used.

Change-Id: If0411f877d1c7c21fcc7a4ac7f03adec3dabd5f6
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
---
 b2qt-init-build-env       | 14 ++++++++++----
 scripts/manifest.xml      |  6 +++---
 scripts/manifest_fido.xml |  6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'b2qt-init-build-env')

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index ddfabf6..cd5952f 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -26,7 +26,10 @@ usage() {
    echo "Usage: $(basename $0) COMMAND [ARGS]"
    echo
    echo "Initialize build environment:"
-   echo "  $(basename $0) init --device <name> [--reference <mirror path>]"
+   echo "  $(basename $0) init --device <name> [--reference <mirror path>] [--internal]"
+   echo "    --device <name>: target device name or 'all'"
+   echo "    --reference <mirror path>: path to local mirror, initialized previously with '$(basename $0) mirror'"
+   echo "    --internal: fetch internal repositories, available only inside The Qt Company network."
    echo "Initialize local mirror:"
    echo "  $(basename $0) mirror"
    echo "List available devices:"
@@ -51,6 +54,9 @@ while test -n "$1"; do
       shift
       REPO_URL="--repo-url $1"
       ;;
+    "--internal")
+      INTERNAL="y"
+      ;;
     *)
       if [ -n "$COMMAND" ]; then
         echo "Unknown argument: $1"
@@ -92,9 +98,6 @@ get_groups() {
     all)
       PROJECT_GROUPS="external"
     ;;
-    internal)
-      PROJECT_GROUPS="external internal"
-    ;;
     apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
     ;;
@@ -132,6 +135,9 @@ get_groups() {
   esac
 
   PROJECT_GROUPS="${PROJECT_GROUPS} default"
+  if [ "${INTERNAL}" = "y" ]; then
+    PROJECT_GROUPS="${PROJECT_GROUPS} internal"
+  fi
 }
 
 list_devices() {
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index d3be1f8..5e326c9 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -77,17 +77,17 @@
            remote="playground"
            revision="3125d29a5c58a471b67104d1bff965df38eb3115"
            path="sources/meta-tegra"
-           groups="notdefault,internal,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
            path="sources/jetson-tk1-pro"
-           groups="notdefault,internal,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
            revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
            path="sources/meta-smx6"
-           groups="notdefault,internal,smx6"/>
+           groups="notdefault,internal"/>
 
 </manifest>
 
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml
index cd4b2c4..be15f02 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_fido.xml
@@ -77,17 +77,17 @@
            remote="playground"
            revision="master"
            path="sources/meta-tegra"
-           groups="notdefault,internal,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="master"
            path="sources/jetson-tk1-pro"
-           groups="notdefault,internal,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
            revision="fido"
            path="sources/meta-smx6"
-           groups="notdefault,internal,smx6"/>
+           groups="notdefault,internal"/>
 
 </manifest>
 
-- 
cgit v1.2.3-54-g00ecf