Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro: Always append to MACHINE_EXTRA_INSTALL qt5: update submodules Enable dbus by default for neptune ui qt5: update submodules Add connman patch to disable connman with boot over nfs Update dbus-session-init to work with systemd Conflicts: conf/distro/include/am335x-evm.conf conf/distro/include/beaglebone.conf conf/distro/include/nvidia-logan.conf 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/qtcharts_git.bbappend recipes-qt/qt5/qtconnectivity_git.bbappend recipes-qt/qt5/qtdeclarative-render2d_git.bbappend recipes-qt/qt5/qtdeclarative_git.bbappend recipes-qt/qt5/qtimageformats_git.bbappend recipes-qt/qt5/qtlocation_git.bbappend recipes-qt/qt5/qtmultimedia_git.bbappend recipes-qt/qt5/qtquickcompiler_git.bb recipes-qt/qt5/qtquickcontrols2_git.bbappend recipes-qt/qt5/qtquickcontrols_git.bbappend recipes-qt/qt5/qtsvg_git.bbappend recipes-qt/qt5/qttools_git.bbappend recipes-qt/qt5/qtwayland-native_git.bbappend recipes-qt/qt5/qtwayland_git.bbappend recipes-qt/qt5/qtwebengine_git.bbappend recipes-qt/qt5/qtxmlpatterns_git.bbappend Change-Id: Ia73290b54a213a9670baab11e14522956e7bfec0
Showing
- conf/distro/include/beagleboard.conf 2 additions, 2 deletionsconf/distro/include/beagleboard.conf
- conf/distro/include/colibri-vf.conf 2 additions, 2 deletionsconf/distro/include/colibri-vf.conf
- conf/distro/include/emulator.conf 2 additions, 2 deletionsconf/distro/include/emulator.conf
- conf/distro/include/imx7dsabresd.conf 2 additions, 2 deletionsconf/distro/include/imx7dsabresd.conf
- conf/distro/include/intel-corei7-64.conf 2 additions, 2 deletionsconf/distro/include/intel-corei7-64.conf
- conf/distro/include/nitrogen6x.conf 1 addition, 1 deletionconf/distro/include/nitrogen6x.conf
- conf/distro/include/raspberrypi.inc 2 additions, 2 deletionsconf/distro/include/raspberrypi.inc
- conf/distro/include/rcar-gen2.inc 1 addition, 1 deletionconf/distro/include/rcar-gen2.inc
- conf/distro/include/smarc-samx6i.conf 1 addition, 1 deletionconf/distro/include/smarc-samx6i.conf
- conf/distro/include/tegra-t18x.conf 1 addition, 1 deletionconf/distro/include/tegra-t18x.conf
- recipes-qt/automotive/neptune-ui/neptune.service 2 additions, 2 deletionsrecipes-qt/automotive/neptune-ui/neptune.service
- recipes/connman/connman_%.bbappend 24 additions, 0 deletionsrecipes/connman/connman_%.bbappend
- recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch 21 additions, 0 deletions...an/files/0001-disable-connman-when-booting-over-nfs.patch
- recipes/dbus/dbus/dbus-session.init 11 additions, 2 deletionsrecipes/dbus/dbus/dbus-session.init
- recipes/dbus/dbus/dbus-session.service 13 additions, 0 deletionsrecipes/dbus/dbus/dbus-session.service
- recipes/dbus/dbus_%.bbappend 21 additions, 3 deletionsrecipes/dbus/dbus_%.bbappend
Loading
Please register or sign in to comment