diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-21 11:57:54 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-21 11:57:54 +0300 |
| commit | 460ef0a31e5e5684e785cdde115244e69f74b01b (patch) | |
| tree | 6f42855f3e92e16e730fd1bfcbf7fb07369d42f7 /scripts | |
| parent | 4ae75513231a69dc176fdb37c20bcb8c87c2f8c8 (diff) | |
| parent | 2b115238356e2cfa963f004cb8469533d4d21305 (diff) | |
| download | meta-boot2qt-460ef0a31e5e5684e785cdde115244e69f74b01b.tar.gz | |
Merge remote-tracking branch 'origin/fido' into jethro
* origin/fido:
qt5: update submodules
toradex: use latest u-boot and flashing scripts
kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
Use code.qt.io with git protocol instead of codereview
Use new repo url for utils and appcontroller
qt5: update submodules
qtquickcompiler: update revision
qtquickcompiler: update revision
Fix typo in RPi overlay config
Update meta layers
Conflicts:
conf/distro/include/colibri-imx6.conf
conf/distro/include/raspberrypi2.conf
conf/distro/include/toradex.inc
meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
recipes-qt/b2qt-addons/b2qt-appcontroller.bb
recipes-qt/b2qt-addons/b2qt-utils.bb
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative-render2d_git.bb
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcompiler_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/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/qtwebengine_git.bbappend
scripts/manifest.xml
Change-Id: I621a82a6deeeb2b74c8179c2f46b4fa42968b636
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 2 | ||||
| -rw-r--r-- | scripts/manifest_jethro.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 474e293..89a97f7 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <remote fetch="git://git.toradex.com" name="toradex"/> | 10 | <remote fetch="git://git.toradex.com" name="toradex"/> |
| 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> | 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> |
| 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> | 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> |
| 13 | <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/> | 13 | <remote fetch="git://code.qt.io/yocto" name="qtyocto"/> |
| 14 | <remote fetch="git://git.yoctoproject.org" name="intel"/> | 14 | <remote fetch="git://git.yoctoproject.org" name="intel"/> |
| 15 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> | 15 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> |
| 16 | <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> | 16 | <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> |
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml index 3555b7c..829ffcb 100644 --- a/scripts/manifest_jethro.xml +++ b/scripts/manifest_jethro.xml | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <remote fetch="git://git.toradex.com" name="toradex"/> | 10 | <remote fetch="git://git.toradex.com" name="toradex"/> |
| 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> | 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> |
| 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> | 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> |
| 13 | <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/> | 13 | <remote fetch="git://code.qt.io/yocto" name="qtyocto"/> |
| 14 | <remote fetch="git://git.yoctoproject.org" name="intel"/> | 14 | <remote fetch="git://git.yoctoproject.org" name="intel"/> |
| 15 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> | 15 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> |
| 16 | <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> | 16 | <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> |