aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-04-11 12:59:21 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-04-18 06:15:34 +0000
commitd40aec778fc15572bb9286f324a92f61af916438 (patch)
treedec364ccb64efdadb417bc9b321c87bf2372baf9
parentfc5cc34b1972b2a3cc3435edb8505c11e7f02619 (diff)
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>
-rwxr-xr-xb2qt-init-build-env14
-rw-r--r--scripts/manifest.xml6
-rw-r--r--scripts/manifest_fido.xml6
3 files changed, 16 insertions, 10 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index ddfabf61..cd5952fa 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 d3be1f8d..5e326c95 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 cd4b2c42..be15f023 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>