summaryrefslogtreecommitdiffstats
path: root/scripts/setup-environment.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/setup-environment.sh')
-rwxr-xr-xscripts/setup-environment.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 3e35ad8..f370032 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -99,18 +99,18 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
99 esac 99 esac
100 100
101 mkdir -p ${PWD}/${BUILDDIRECTORY}/conf 101 mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
102 cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf 102 cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
103 103
104 if [ ! -d ${PWD}/sources/meta-qt5 ]; then 104 if [ ! -d ${PWD}/sources/meta-qt5 ]; then
105 sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf 105 sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
106 fi 106 fi
107 107
108 if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then 108 if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
109 QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../) 109 QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
110 fi 110 fi
111fi 111fi
112 112
113export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf" 113export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
114. sources/poky/oe-init-build-env ${BUILDDIRECTORY} 114. sources/poky/oe-init-build-env ${BUILDDIRECTORY}
115 115
116# use sources from Qt SDK if that is available 116# use sources from Qt SDK if that is available