summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-06-08 09:00:08 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-06-08 06:34:00 +0000
commit26d76bfcb8a0e263c79e40023659c1e09148e1f0 (patch)
tree27f01070634510acddaaa826098cc2b39238c431 /scripts
parentc98e5af2b81cfcd9b387c3a1e158857ab9fde76b (diff)
downloadmeta-boot2qt-26d76bfcb8a0e263c79e40023659c1e09148e1f0.tar.gz
meta layer was renamed to meta-boot2qt
Change-Id: I1b96be87215a6ddf720c83693df1f3bcc2a99b66 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-all.sh2
-rwxr-xr-xscripts/setup-environment.sh8
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index 057eb7b..d3502ba 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -40,7 +40,7 @@ for DIR in $(ls -d build-*); do
40 bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk 40 bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk
41 if [ $? = 0 ]; then 41 if [ $? = 0 ]; then
42 if [ -n "${UPLOAD}" ]; then 42 if [ -n "${UPLOAD}" ]; then
43 ../sources/meta-b2qt/scripts/upload.sh 43 ../sources/meta-boot2qt/scripts/upload.sh
44 fi 44 fi
45 else 45 else
46 echo " build failed" >> ../build.log 46 echo " build failed" >> ../build.log
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
97fi 97fi
98 98
99export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf" 99export 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