diff options
author | Samuli Piippo <samuli.piippo@digia.com> | 2014-10-07 13:51:03 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-10-14 08:16:18 +0300 |
commit | eb498abc47e8f01c77d27506fa430ac1fdbf6f44 (patch) | |
tree | 8dfa4f76dcc9af65f9fbb40428e0eb12e5decba5 /b2qt-init-build-env | |
parent | abd189a666802ad8c1c6315eef9ef292169edcbd (diff) | |
download | meta-boot2qt-eb498abc47e8f01c77d27506fa430ac1fdbf6f44.tar.gz |
Improvements to setup scripts
- use the already fetched .repo/repo as a workaround for repo tool's
mandatory -u argument
- rename environment-setup.sh script
- Add notice about correctly sourcing the environment-setup.sh script
Change-Id: I4ac3cf26ca30ae1c14474cf9fb15e65ebc0be3ac
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Diffstat (limited to 'b2qt-init-build-env')
-rwxr-xr-x | b2qt-init-build-env | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 2deb8a4..0fa07ba 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -120,7 +120,7 @@ mirror() { | |||
120 | mkdir -p .repo/manifests | 120 | mkdir -p .repo/manifests |
121 | cp ${DIR}/scripts/manifest.xml .repo/manifests/ | 121 | cp ${DIR}/scripts/manifest.xml .repo/manifests/ |
122 | MANIFEST="manifest.xml" | 122 | MANIFEST="manifest.xml" |
123 | ${REPO} init -u https://gerrit.googlesource.com/git-repo -m ${MANIFEST} -g all --mirror | 123 | ${REPO} init -u .repo/repo -m ${MANIFEST} -g all --mirror |
124 | ${REPO} sync | 124 | ${REPO} sync |
125 | } | 125 | } |
126 | 126 | ||
@@ -139,14 +139,14 @@ init() { | |||
139 | else | 139 | else |
140 | MANIFEST="manifest.xml" | 140 | MANIFEST="manifest.xml" |
141 | fi | 141 | fi |
142 | ${REPO} init -u https://gerrit.googlesource.com/git-repo -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE} | 142 | ${REPO} init -u .repo/repo -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE} |
143 | ${REPO} sync | 143 | ${REPO} sync |
144 | 144 | ||
145 | if [ ! -e "sources/meta-b2qt" ]; then | 145 | if [ ! -e "sources/meta-b2qt" ]; then |
146 | ln -s ${DIR} sources/meta-b2qt | 146 | ln -s ${DIR} sources/meta-b2qt |
147 | fi | 147 | fi |
148 | 148 | ||
149 | cp ${DIR}/scripts/setup_environment.sh . | 149 | cp ${DIR}/scripts/setup-environment.sh . |
150 | 150 | ||
151 | } | 151 | } |
152 | 152 | ||