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
No related branches found
No related tags found
Showing
- meta-boot2qt-distro/conf/bblayers.conf.boundary.sample 1 addition, 0 deletionsmeta-boot2qt-distro/conf/bblayers.conf.boundary.sample
- meta-boot2qt-distro/conf/bblayers.conf.fsl.sample 1 addition, 0 deletionsmeta-boot2qt-distro/conf/bblayers.conf.fsl.sample
- meta-boot2qt-distro/conf/bblayers.conf.intel.sample 1 addition, 0 deletionsmeta-boot2qt-distro/conf/bblayers.conf.intel.sample
- meta-boot2qt-distro/conf/bblayers.conf.jetson.sample 1 addition, 0 deletionsmeta-boot2qt-distro/conf/bblayers.conf.jetson.sample
- meta-boot2qt-distro/conf/bblayers.conf.rpi.sample 1 addition, 0 deletionsmeta-boot2qt-distro/conf/bblayers.conf.rpi.sample
- meta-boot2qt-distro/conf/bblayers.conf.sample 1 addition, 0 deletionsmeta-boot2qt-distro/conf/bblayers.conf.sample
- meta-boot2qt-distro/conf/bblayers.conf.toradex.sample 1 addition, 0 deletionsmeta-boot2qt-distro/conf/bblayers.conf.toradex.sample
- meta-boot2qt-distro/conf/layer.conf 4 additions, 0 deletionsmeta-boot2qt-distro/conf/layer.conf
- meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend 8 additions, 13 deletions...multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend
- meta-boot2qt/files/qbsp/NXP-EULA 298 additions, 241 deletionsmeta-boot2qt/files/qbsp/NXP-EULA
- meta-boot2qt/recipes-core/dbus/dbus-session/dbus-session@.service 2 additions, 1 deletion...t2qt/recipes-core/dbus/dbus-session/dbus-session@.service
- meta-boot2qt/recipes-core/ostree/ostree/Avoid-race-condition-in-case-tests-directory-does-no.patch 27 additions, 0 deletions...void-race-condition-in-case-tests-directory-does-no.patch
- meta-boot2qt/recipes-core/ostree/ostree_git.bb 1 addition, 0 deletionsmeta-boot2qt/recipes-core/ostree/ostree_git.bb
- meta-boot2qt/recipes-qt/automotive/gammaray_git.bb 2 additions, 2 deletionsmeta-boot2qt/recipes-qt/automotive/gammaray_git.bb
- meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb 3 additions, 3 deletionsmeta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
- meta-boot2qt/recipes-qt/automotive/qmllive_git.bb 1 addition, 1 deletionmeta-boot2qt/recipes-qt/automotive/qmllive_git.bb
- meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb 1 addition, 1 deletion...boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
- meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb 1 addition, 1 deletionmeta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
- scripts/manifest.xml 6 additions, 2 deletionsscripts/manifest.xml
Loading
Please register or sign in to comment