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 /b2qt-init-build-env | |
| 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 'b2qt-init-build-env')
| -rwxr-xr-x | b2qt-init-build-env | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index bfe52a4..469042c 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
| @@ -188,8 +188,8 @@ init() { | |||
| 188 | ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} | 188 | ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} |
| 189 | ${REPO} sync | 189 | ${REPO} sync |
| 190 | 190 | ||
| 191 | if [ ! -e "sources/meta-b2qt" ]; then | 191 | if [ ! -e "sources/meta-boot2qt" ]; then |
| 192 | ln -s ${DIR} sources/meta-b2qt | 192 | ln -s ${DIR} sources/meta-boot2qt |
| 193 | fi | 193 | fi |
| 194 | 194 | ||
| 195 | if [ ! -e "sources/meta-qt5" ] && [ -e "${DIR}/../meta-qt5" ]; then | 195 | if [ ! -e "sources/meta-qt5" ] && [ -e "${DIR}/../meta-qt5" ]; then |