diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-11 12:59:21 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 06:15:34 +0000 |
commit | d40aec778fc15572bb9286f324a92f61af916438 (patch) | |
tree | dec364ccb64efdadb417bc9b321c87bf2372baf9 | |
parent | fc5cc34b1972b2a3cc3435edb8505c11e7f02619 (diff) | |
download | meta-boot2qt-d40aec778fc15572bb9286f324a92f61af916438.tar.gz |
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-x | b2qt-init-build-env | 14 | ||||
-rw-r--r-- | scripts/manifest.xml | 6 | ||||
-rw-r--r-- | scripts/manifest_fido.xml | 6 |
3 files changed, 16 insertions, 10 deletions
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() { | |||
26 | echo "Usage: $(basename $0) COMMAND [ARGS]" | 26 | echo "Usage: $(basename $0) COMMAND [ARGS]" |
27 | echo | 27 | echo |
28 | echo "Initialize build environment:" | 28 | echo "Initialize build environment:" |
29 | echo " $(basename $0) init --device <name> [--reference <mirror path>]" | 29 | echo " $(basename $0) init --device <name> [--reference <mirror path>] [--internal]" |
30 | echo " --device <name>: target device name or 'all'" | ||
31 | echo " --reference <mirror path>: path to local mirror, initialized previously with '$(basename $0) mirror'" | ||
32 | echo " --internal: fetch internal repositories, available only inside The Qt Company network." | ||
30 | echo "Initialize local mirror:" | 33 | echo "Initialize local mirror:" |
31 | echo " $(basename $0) mirror" | 34 | echo " $(basename $0) mirror" |
32 | echo "List available devices:" | 35 | echo "List available devices:" |
@@ -51,6 +54,9 @@ while test -n "$1"; do | |||
51 | shift | 54 | shift |
52 | REPO_URL="--repo-url $1" | 55 | REPO_URL="--repo-url $1" |
53 | ;; | 56 | ;; |
57 | "--internal") | ||
58 | INTERNAL="y" | ||
59 | ;; | ||
54 | *) | 60 | *) |
55 | if [ -n "$COMMAND" ]; then | 61 | if [ -n "$COMMAND" ]; then |
56 | echo "Unknown argument: $1" | 62 | echo "Unknown argument: $1" |
@@ -92,9 +98,6 @@ get_groups() { | |||
92 | all) | 98 | all) |
93 | PROJECT_GROUPS="external" | 99 | PROJECT_GROUPS="external" |
94 | ;; | 100 | ;; |
95 | internal) | ||
96 | PROJECT_GROUPS="external internal" | ||
97 | ;; | ||
98 | apalis-imx6|colibri-imx6|colibri-vf) | 101 | apalis-imx6|colibri-imx6|colibri-vf) |
99 | PROJECT_GROUPS="toradex" | 102 | PROJECT_GROUPS="toradex" |
100 | ;; | 103 | ;; |
@@ -132,6 +135,9 @@ get_groups() { | |||
132 | esac | 135 | esac |
133 | 136 | ||
134 | PROJECT_GROUPS="${PROJECT_GROUPS} default" | 137 | PROJECT_GROUPS="${PROJECT_GROUPS} default" |
138 | if [ "${INTERNAL}" = "y" ]; then | ||
139 | PROJECT_GROUPS="${PROJECT_GROUPS} internal" | ||
140 | fi | ||
135 | } | 141 | } |
136 | 142 | ||
137 | list_devices() { | 143 | 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 @@ | |||
77 | remote="playground" | 77 | remote="playground" |
78 | revision="3125d29a5c58a471b67104d1bff965df38eb3115" | 78 | revision="3125d29a5c58a471b67104d1bff965df38eb3115" |
79 | path="sources/meta-tegra" | 79 | path="sources/meta-tegra" |
80 | groups="notdefault,internal,nvidia-logan"/> | 80 | groups="notdefault,internal"/> |
81 | <project name="jetson-tk1-pro" | 81 | <project name="jetson-tk1-pro" |
82 | remote="playground" | 82 | remote="playground" |
83 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" | 83 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" |
84 | path="sources/jetson-tk1-pro" | 84 | path="sources/jetson-tk1-pro" |
85 | groups="notdefault,internal,nvidia-logan"/> | 85 | groups="notdefault,internal"/> |
86 | <project name="meta-smx6" | 86 | <project name="meta-smx6" |
87 | remote="playground" | 87 | remote="playground" |
88 | revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d" | 88 | revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d" |
89 | path="sources/meta-smx6" | 89 | path="sources/meta-smx6" |
90 | groups="notdefault,internal,smx6"/> | 90 | groups="notdefault,internal"/> |
91 | 91 | ||
92 | </manifest> | 92 | </manifest> |
93 | 93 | ||
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 @@ | |||
77 | remote="playground" | 77 | remote="playground" |
78 | revision="master" | 78 | revision="master" |
79 | path="sources/meta-tegra" | 79 | path="sources/meta-tegra" |
80 | groups="notdefault,internal,nvidia-logan"/> | 80 | groups="notdefault,internal"/> |
81 | <project name="jetson-tk1-pro" | 81 | <project name="jetson-tk1-pro" |
82 | remote="playground" | 82 | remote="playground" |
83 | revision="master" | 83 | revision="master" |
84 | path="sources/jetson-tk1-pro" | 84 | path="sources/jetson-tk1-pro" |
85 | groups="notdefault,internal,nvidia-logan"/> | 85 | groups="notdefault,internal"/> |
86 | <project name="meta-smx6" | 86 | <project name="meta-smx6" |
87 | remote="playground" | 87 | remote="playground" |
88 | revision="fido" | 88 | revision="fido" |
89 | path="sources/meta-smx6" | 89 | path="sources/meta-smx6" |
90 | groups="notdefault,internal,smx6"/> | 90 | groups="notdefault,internal"/> |
91 | 91 | ||
92 | </manifest> | 92 | </manifest> |
93 | 93 | ||