summaryrefslogtreecommitdiffstats
path: root/scripts/setup-environment.sh
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-03-02 13:08:39 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-03-12 14:12:31 +0000
commit344c2f97025c6504ec986600498121bb83aaeb8f (patch)
tree3d7ec602603cb083b7c8e998eddca543ce17e57c /scripts/setup-environment.sh
parentd9985542d7617b43ec7180c7ade0c4f64db82b42 (diff)
downloadmeta-boot2qt-344c2f97025c6504ec986600498121bb83aaeb8f.tar.gz
Split meta-boot2qt layer
Move distro specific recipes to own layer and leave only new recipes and bbclasses to meta-boot2qt layer. This makes it easier to include meta-boot2qt to your own distro layer to get access e.g., QDB and QBSP recipes that might be useful even without boot2qt distro. Task-number: QTBUG-65871 Change-Id: I6c353774dd1668b00f2d05aa262ad866b90bdef6 Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>
Diffstat (limited to 'scripts/setup-environment.sh')
-rwxr-xr-xscripts/setup-environment.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 1fa2014..f948ba0 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -96,14 +96,14 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
96 esac 96 esac
97 97
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/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
100 100
101 if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then 101 if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; 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
104fi 104fi
105 105
106export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf" 106export TEMPLATECONF="${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf"
107. sources/poky/oe-init-build-env ${BUILDDIRECTORY} 107. sources/poky/oe-init-build-env ${BUILDDIRECTORY}
108 108
109# use sources from Qt SDK if that is available 109# use sources from Qt SDK if that is available