diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-08 10:04:06 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-08 10:30:01 +0300 |
commit | 43c5ae5df2419c0caf584488b860917038e9a31c (patch) | |
tree | 22d48098642d2408fc85466f60898fda237a1c60 /scripts/setup-environment.sh | |
parent | c13d43f6ee67f57470cd0090dca137a9395c4bb0 (diff) | |
parent | 26d76bfcb8a0e263c79e40023659c1e09148e1f0 (diff) | |
download | meta-boot2qt-43c5ae5df2419c0caf584488b860917038e9a31c.tar.gz |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
meta layer was renamed to meta-boot2qt
b2qt addons: update repository urls
Use git.qt.io as the new playground repo server
qtconnectivity: remove incorrect PACKAGECONFIG to enable bluez support
qt5: update submodules and meta-qt5
Conflicts:
conf/bblayers.conf.bbb.sample
conf/bblayers.conf.emulator.sample
conf/bblayers.conf.fsl.sample
conf/bblayers.conf.intel.sample
conf/bblayers.conf.nvidia-logan.sample
conf/bblayers.conf.rpi.sample
conf/bblayers.conf.sample
conf/bblayers.conf.smx6.sample
conf/bblayers.conf.ti.sample
conf/bblayers.conf.tibidabo.sample
conf/bblayers.conf.toradex.sample
conf/distro/b2qt.conf
recipes-qt/b2qt-addons/b2qt-demos.bb
recipes-qt/b2qt-addons/b2qt-launcher.bb
recipes-qt/qt5-addons/qtcharts_git.bb
recipes-qt/qt5-addons/qtdatavis3d_git.bb
recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
recipes-qt/qt5-addons/qtquickcompiler_git.bb
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qt3d_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtgraphicaleffects_git.bbappend
recipes-qt/qt5/qtimageformats_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsensors_git.bbappend
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bbappend
recipes-qt/qt5/qtsvg_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebchannel_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
recipes-qt/qt5/qtwebsockets_git.bbappend
recipes-qt/qt5/qtxmlpatterns_git.bbappend
scripts/manifest.xml
Change-Id: I06904eb8ff7a30240ce289808f43fbba6339f670
Diffstat (limited to 'scripts/setup-environment.sh')
-rwxr-xr-x | scripts/setup-environment.sh | 8 |
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 |
111 | fi | 111 | fi |
112 | 112 | ||
113 | export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf" | 113 | export 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 |