diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 10:14:32 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 10:15:24 +0300 |
| commit | abd29cce5e3cc3b0d0d2cf023bb9d327ef96f548 (patch) | |
| tree | f58615ff2ceb23fe22d15901e977772d865ebf80 /scripts/manifest.xml | |
| parent | 64d0d088725b7ad70080068c3eb9f5dccec9bd32 (diff) | |
| parent | 293bb2b4195281d7b4a56f16c77bdf16831334e4 (diff) | |
| download | meta-boot2qt-abd29cce5e3cc3b0d0d2cf023bb9d327ef96f548.tar.gz | |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
Move usage of internal mirrors into a bbclass
Use --internal arg to fetch playground repos
qtquickcompiler: update revision to work with Qt 5.6.1
qt5: update submodules
gcc: patch already applied on oe layer
Update revisions for poky and openembedded
Fix meta-environment to work without changes in local.conf
Disabled SSTATE_MIRRORS and PRE_MIRRORS.
setup-environment: prevent basename argument being parsed as option.
Do not pull internal repos when initializing for all devices
Conflicts:
conf/local.conf.sample
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/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
scripts/manifest_jethro.xml
Change-Id: I17c4dd6890dc4475171133cede4dc7e6217222d6
Diffstat (limited to 'scripts/manifest.xml')
| -rw-r--r-- | scripts/manifest.xml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 74cee35..28ccfa3 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | remote="qtyocto" | 27 | remote="qtyocto" |
| 28 | revision="e6897ccd0eec8fb5229e0fdd8f354292e0f49a16" | 28 | revision="e6897ccd0eec8fb5229e0fdd8f354292e0f49a16" |
| 29 | path="sources/meta-qt5"/> | 29 | path="sources/meta-qt5"/> |
| 30 | |||
| 31 | <project name="meta-mingw" | 30 | <project name="meta-mingw" |
| 32 | remote="qtyocto" | 31 | remote="qtyocto" |
| 33 | path="sources/meta-mingw" | 32 | path="sources/meta-mingw" |
| @@ -37,58 +36,58 @@ | |||
| 37 | remote="yocto" | 36 | remote="yocto" |
| 38 | revision="8d22b44716fa624ff87383c36d222d9e28d0b267" | 37 | revision="8d22b44716fa624ff87383c36d222d9e28d0b267" |
| 39 | path="sources/meta-fsl-arm" | 38 | path="sources/meta-fsl-arm" |
| 40 | groups="notdefault,fsl,toradex,architech,ti,bbb,smx6"/> | 39 | groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/> |
| 41 | <project name="meta-ti" | 40 | <project name="meta-ti" |
| 42 | remote="yocto" | 41 | remote="yocto" |
| 43 | revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a" | 42 | revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a" |
| 44 | path="sources/meta-ti" | 43 | path="sources/meta-ti" |
| 45 | groups="notdefault,ti,bbb"/> | 44 | groups="notdefault,external,ti,bbb"/> |
| 46 | <project name="meta-raspberrypi" | 45 | <project name="meta-raspberrypi" |
| 47 | remote="yocto" | 46 | remote="yocto" |
| 48 | revision="e82417d33b8147f65141ef937d56735d80ee7207" | 47 | revision="e82417d33b8147f65141ef937d56735d80ee7207" |
| 49 | path="sources/meta-raspberrypi" | 48 | path="sources/meta-raspberrypi" |
| 50 | groups="notdefault,rpi"/> | 49 | groups="notdefault,external,rpi"/> |
| 51 | <project name="meta-fsl-arm-extra" | 50 | <project name="meta-fsl-arm-extra" |
| 52 | remote="freescale" | 51 | remote="freescale" |
| 53 | revision="8fdde39f732be9e1ee9505a04c579073114459e7" | 52 | revision="8fdde39f732be9e1ee9505a04c579073114459e7" |
| 54 | path="sources/meta-fsl-arm-extra" | 53 | path="sources/meta-fsl-arm-extra" |
| 55 | groups="notdefault,fsl,toradex,architech,smx6"/> | 54 | groups="notdefault,external,fsl,toradex,architech,smx6"/> |
| 56 | <project name="meta-beagleboard" | 55 | <project name="meta-beagleboard" |
| 57 | remote="beagleboard" | 56 | remote="beagleboard" |
| 58 | revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60" | 57 | revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60" |
| 59 | path="sources/meta-beagleboard" | 58 | path="sources/meta-beagleboard" |
| 60 | groups="notdefault,bbb"/> | 59 | groups="notdefault,external,bbb"/> |
| 61 | <project name="meta-toradex" | 60 | <project name="meta-toradex" |
| 62 | remote="toradex" | 61 | remote="toradex" |
| 63 | revision="eca5937408c75a997b160bd1b92e1496b07421cf" | 62 | revision="eca5937408c75a997b160bd1b92e1496b07421cf" |
| 64 | path="sources/meta-toradex" | 63 | path="sources/meta-toradex" |
| 65 | groups="notdefault,toradex"/> | 64 | groups="notdefault,external,toradex"/> |
| 66 | <project name="meta-tibidabo" | 65 | <project name="meta-tibidabo" |
| 67 | remote="architech" | 66 | remote="architech" |
| 68 | revision="06c6b09e0776507e1230aa98b5ca10d9d3968286" | 67 | revision="06c6b09e0776507e1230aa98b5ca10d9d3968286" |
| 69 | path="sources/meta-tibidabo" | 68 | path="sources/meta-tibidabo" |
| 70 | groups="notdefault,architech"/> | 69 | groups="notdefault,external,architech"/> |
| 71 | <project name="meta-intel" | 70 | <project name="meta-intel" |
| 72 | remote="intel" | 71 | remote="intel" |
| 73 | revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9" | 72 | revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9" |
| 74 | path="sources/meta-intel" | 73 | path="sources/meta-intel" |
| 75 | groups="notdefault,intel"/> | 74 | groups="notdefault,external,intel"/> |
| 76 | 75 | ||
| 77 | <project name="meta-tegra" | 76 | <project name="meta-tegra" |
| 78 | remote="playground" | 77 | remote="playground" |
| 79 | revision="3125d29a5c58a471b67104d1bff965df38eb3115" | 78 | revision="3125d29a5c58a471b67104d1bff965df38eb3115" |
| 80 | path="sources/meta-tegra" | 79 | path="sources/meta-tegra" |
| 81 | groups="notdefault,nvidia-logan"/> | 80 | groups="notdefault,internal"/> |
| 82 | <project name="jetson-tk1-pro" | 81 | <project name="jetson-tk1-pro" |
| 83 | remote="playground" | 82 | remote="playground" |
| 84 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" | 83 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" |
| 85 | path="sources/jetson-tk1-pro" | 84 | path="sources/jetson-tk1-pro" |
| 86 | groups="notdefault,nvidia-logan"/> | 85 | groups="notdefault,internal"/> |
| 87 | <project name="meta-smx6" | 86 | <project name="meta-smx6" |
| 88 | remote="playground" | 87 | remote="playground" |
| 89 | revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d" | 88 | revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d" |
| 90 | path="sources/meta-smx6" | 89 | path="sources/meta-smx6" |
| 91 | groups="notdefault,smx6"/> | 90 | groups="notdefault,internal"/> |
| 92 | 91 | ||
| 93 | </manifest> | 92 | </manifest> |
| 94 | 93 | ||
