diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 15:28:15 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 15:30:05 +0200 |
| commit | 3a8194abdf81be79f9aff977fece485c596d4432 (patch) | |
| tree | 721a44e79c61b63747c90fe1dabe438ea4cb90d8 /scripts | |
| parent | 570c75e6872f59e5fae24df1c98eecc3a86b690e (diff) | |
| parent | 92d6772cc013c33829ad8159614d29cdccb268a2 (diff) | |
Merge remote-tracking branch 'qt/warrior' into zeus
* qt/warrior:
92d6772c Merge remote-tracking branch 'qt/5.14.1_QtAS' into warrior
4836e23f boot2qt-demos: update to latest revision
561de043 ostree: avoid race condition in case tests directory does not exist
f83f59f2 Update automotive sha1s for QtAS 5.14.1
93c5d711 [automotive] update sha1 for Neptune 3 UI
0f295b8a meta-qt5: update layer
ebcc35ae boot2qt-launcher: update to latest revision
58dfb705 boundary, freescale-3rdparty: update layers
7f2639d3 Merge remote-tracking branch 'qt/5.14.1_QtAS' into warrior
719c7efe Move back to primary toradex git server
7e50e244 dbus-session: make sure user runtime dir is created in time
6a33600f meta-qt5: update layer
0a16af41 poky: update yocto to v2.7.3
9149850e Update NXP EULA to latest version
d0327eb8 qtapplicationmanager: update revision
25fdf1b0 gammaray: update license checksum
83ab6464 [automotive] update fonts license
7414c000 Update automotive sha1s for QtAS 5.14.1
Conflicts:
meta-boot2qt-distro/conf/layer.conf
meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc
scripts/manifest.xml
Change-Id: Ie8cf7c4807c7d8ca4be87adf8307a3dac8b332fb
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 6ce68f24..7704dbfc 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -18,9 +18,13 @@ <remote name="oe-mirror" fetch="git://github.com/openembedded"/> <project name="meta-openembedded" - remote="oe-mirror" + remote="oe" revision="bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c" path="sources/meta-openembedded"/> + <project name="meta-python2" + remote="oe" + revision="8fc9be701d430388b4c5234c97e623debd26a1df" + path="sources/meta-python2"/> <!-- Qt --> <remote name="qt" @@ -77,7 +81,7 @@ <!-- Toradex --> <remote name="toradex" - fetch="git://git2.toradex.com"/> + fetch="git://git.toradex.com"/> <project name="meta-toradex-bsp-common" remote="toradex" revision="fbd77af45f32e88e96d0efe0317d346a55e5580a" |