From 26d76bfcb8a0e263c79e40023659c1e09148e1f0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 8 Jun 2016 09:00:08 +0300 Subject: meta layer was renamed to meta-boot2qt Change-Id: I1b96be87215a6ddf720c83693df1f3bcc2a99b66 Reviewed-by: Teemu Holappa --- scripts/build-all.sh | 2 +- scripts/setup-environment.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') 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 bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk if [ $? = 0 ]; then if [ -n "${UPLOAD}" ]; then - ../sources/meta-b2qt/scripts/upload.sh + ../sources/meta-boot2qt/scripts/upload.sh fi else 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 esac mkdir -p ${PWD}/${BUILDDIRECTORY}/conf - cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf + cp ${PWD}/sources/meta-boot2qt/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/../../../../) + if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then + QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../) fi fi -export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf" +export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf" . sources/poky/oe-init-build-env ${BUILDDIRECTORY} # use sources from Qt SDK if that is available -- cgit v1.2.3-54-g00ecf