diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-03-02 13:17:18 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-03-02 13:07:31 +0000 |
commit | 8021e75c217b9eb843aeef2b76f72acf72c6c46d (patch) | |
tree | 78252495ec9d8cd091e7fb2ba8a7d13650ce1e0c | |
parent | c14277b8cbe66729ae1dbdad857fcf61259e76db (diff) | |
download | meta-boot2qt-8021e75c217b9eb843aeef2b76f72acf72c6c46d.tar.gz |
scripts: remove obsolete setups for meta-qt5
meta-qt5 layer setup no longer needs there extra steps.
Change-Id: I23dae008104033d32afab81eca0390e70a276cc2
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rwxr-xr-x | b2qt-init-build-env | 4 | ||||
-rwxr-xr-x | scripts/setup-environment.sh | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index ad73378..064aa27 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -191,10 +191,6 @@ init() { | |||
191 | ln -s ${DIR} sources/meta-boot2qt | 191 | ln -s ${DIR} sources/meta-boot2qt |
192 | fi | 192 | fi |
193 | 193 | ||
194 | if [ ! -e "sources/meta-qt5" ] && [ -e "${DIR}/../meta-qt5" ]; then | ||
195 | ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5 | ||
196 | fi | ||
197 | |||
198 | if [ ! -e "setup-environment.sh" ]; then | 194 | if [ ! -e "setup-environment.sh" ]; then |
199 | ln -s ${DIR}/scripts/setup-environment.sh setup-environment.sh | 195 | ln -s ${DIR}/scripts/setup-environment.sh setup-environment.sh |
200 | fi | 196 | fi |
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index c0d952f..1fa2014 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
@@ -98,10 +98,6 @@ 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/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf | 99 | cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf |
100 | 100 | ||
101 | if [ ! -d ${PWD}/sources/meta-qt5 ]; then | ||
102 | sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf | ||
103 | fi | ||
104 | |||
105 | if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then | 101 | if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then |
106 | QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../) | 102 | QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../) |
107 | fi | 103 | fi |