diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-03-20 13:48:43 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-24 05:23:48 +0000 |
| commit | f533db349bef3c45cfbcdbdf527a8e73c39346b0 (patch) | |
| tree | 612cec78affb1dbd8a431840890b66ea9ea86ca1 /scripts | |
| parent | f2b87ab7629d73ff769f10568c31835cc3c3f7b5 (diff) | |
| download | meta-boot2qt-f533db349bef3c45cfbcdbdf527a8e73c39346b0.tar.gz | |
Don't use git folder to check if we are using SDK sources
The license file is added to the sources when SDK is created,
use that instead of the git folder to check if we are inside SDK.
Allows users to create git repo out of the SDK sources.
Change-Id: I01f1837fc9d35063470e4409d64d9e1ccaa08e48
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setup-environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index c66c626..c0e8f79 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
| @@ -98,7 +98,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
| 98 | mkdir -p ${PWD}/${BUILDDIRECTORY}/conf | 98 | mkdir -p ${PWD}/${BUILDDIRECTORY}/conf |
| 99 | cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf | 99 | cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf |
| 100 | 100 | ||
| 101 | if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then | 101 | if [ -e ${PWD}/sources/meta-boot2qt/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT ]; then |
| 102 | QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../) | 102 | QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../) |
| 103 | fi | 103 | fi |
| 104 | fi | 104 | fi |