diff options
Diffstat (limited to 'scripts/setup-environment.sh')
-rwxr-xr-x | scripts/setup-environment.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 566b708..56aadc0 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
@@ -85,18 +85,18 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
85 | esac | 85 | esac |
86 | 86 | ||
87 | mkdir -p ${PWD}/${BUILDDIRECTORY}/conf | 87 | mkdir -p ${PWD}/${BUILDDIRECTORY}/conf |
88 | cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf | 88 | cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf |
89 | 89 | ||
90 | if [ ! -d ${PWD}/sources/meta-qt5 ]; then | 90 | if [ ! -d ${PWD}/sources/meta-qt5 ]; then |
91 | sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf | 91 | sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf |
92 | fi | 92 | fi |
93 | 93 | ||
94 | if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then | 94 | if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then |
95 | QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../) | 95 | QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../) |
96 | fi | 96 | fi |
97 | fi | 97 | fi |
98 | 98 | ||
99 | export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf" | 99 | export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf" |
100 | . sources/poky/oe-init-build-env ${BUILDDIRECTORY} | 100 | . sources/poky/oe-init-build-env ${BUILDDIRECTORY} |
101 | 101 | ||
102 | # use sources from Qt SDK if that is available | 102 | # use sources from Qt SDK if that is available |