From 455e002444b5c293fbdc4e6ba2a20d7c26d0e995 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 Jun 2015 09:34:12 +0300 Subject: Handle missing meta-qt5 layer If meta-qt5 layer is not available, remove it from bblayer.conf as well. When using --device qt5, use the pinned revisions of other meta layer repos. Change-Id: I42f12d9725f3871a49b81b711b5f97037c4febd0 Reviewed-by: Eirik Aavitsland --- scripts/setup-environment.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/setup-environment.sh') diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 26c374d..686a65c 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -79,6 +79,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then mkdir -p ${PWD}/${BUILDDIRECTORY}/conf cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf + if [ ! -d ${PWD}/sources/meta-qt5 ]; then + sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf + fi + if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../) fi -- cgit v1.2.3-54-g00ecf