diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-12 15:59:03 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-12 16:25:02 +0300 |
commit | f73f001826f9df801708e087af4ca121cf058b7d (patch) | |
tree | 1b4cb30fb5e2c360c74dabb0e4d14d847f0abd85 /conf | |
parent | c1bd2a954272b2c2aca0891b1a19348062efa002 (diff) | |
parent | 415e9f875b9c153c62883b5177bf836e722e8800 (diff) | |
download | meta-boot2qt-f73f001826f9df801708e087af4ca121cf058b7d.tar.gz |
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
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/beagleboard.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/emulator.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/imx7dsabresd.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/intel-corei7-64.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/nitrogen6x.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/raspberrypi.inc | 4 | ||||
-rw-r--r-- | conf/distro/include/rcar-gen2.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/smarc-samx6i.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/tegra-t18x.conf | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index bde997c..7f42acf 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf | |||
@@ -43,12 +43,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" | |||
43 | PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" | 43 | PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" |
44 | PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" | 44 | PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" |
45 | 45 | ||
46 | MACHINE_EXTRA_INSTALL = "\ | 46 | MACHINE_EXTRA_INSTALL += "\ |
47 | libgles-omap3 \ | 47 | libgles-omap3 \ |
48 | libgles-omap3-rawdemos \ | 48 | libgles-omap3-rawdemos \ |
49 | " | 49 | " |
50 | 50 | ||
51 | MACHINE_EXTRA_INSTALL_SDK = "\ | 51 | MACHINE_EXTRA_INSTALL_SDK += "\ |
52 | libgles-omap3-dev \ | 52 | libgles-omap3-dev \ |
53 | " | 53 | " |
54 | 54 | ||
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 845e2ff..1e8a5ac 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -48,10 +48,10 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | |||
48 | 48 | ||
49 | DISTRO_FEATURES_remove = "webengine" | 49 | DISTRO_FEATURES_remove = "webengine" |
50 | 50 | ||
51 | MACHINE_EXTRA_INSTALL = "\ | 51 | MACHINE_EXTRA_INSTALL += "\ |
52 | opengldummy \ | 52 | opengldummy \ |
53 | " | 53 | " |
54 | 54 | ||
55 | MACHINE_EXTRA_INSTALL_SDK = "\ | 55 | MACHINE_EXTRA_INSTALL_SDK += "\ |
56 | opengldummy-dev \ | 56 | opengldummy-dev \ |
57 | " | 57 | " |
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index a8dcc84..cd3a80a 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf | |||
@@ -43,10 +43,10 @@ KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf" | |||
43 | 43 | ||
44 | DISTRO_FEATURES_remove = "webengine opengl" | 44 | DISTRO_FEATURES_remove = "webengine opengl" |
45 | 45 | ||
46 | MACHINE_EXTRA_INSTALL = "\ | 46 | MACHINE_EXTRA_INSTALL += "\ |
47 | mount-vboxsf \ | 47 | mount-vboxsf \ |
48 | " | 48 | " |
49 | MACHINE_EXTRA_INSTALL_SDK = "\ | 49 | MACHINE_EXTRA_INSTALL_SDK += "\ |
50 | qtglesstream-dummy-client-dev \ | 50 | qtglesstream-dummy-client-dev \ |
51 | " | 51 | " |
52 | MACHINE_EXTRA_INSTALL_QT = "\ | 52 | MACHINE_EXTRA_INSTALL_QT = "\ |
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf index 66d2b4c..b21e5b1 100644 --- a/conf/distro/include/imx7dsabresd.conf +++ b/conf/distro/include/imx7dsabresd.conf | |||
@@ -50,9 +50,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" | |||
50 | 50 | ||
51 | DISTRO_FEATURES_remove = "webengine" | 51 | DISTRO_FEATURES_remove = "webengine" |
52 | 52 | ||
53 | MACHINE_EXTRA_INSTALL = "\ | 53 | MACHINE_EXTRA_INSTALL += "\ |
54 | " | 54 | " |
55 | 55 | ||
56 | MACHINE_EXTRA_INSTALL_SDK = "\ | 56 | MACHINE_EXTRA_INSTALL_SDK += "\ |
57 | " | 57 | " |
58 | 58 | ||
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf index 395a631..d350c0e 100644 --- a/conf/distro/include/intel-corei7-64.conf +++ b/conf/distro/include/intel-corei7-64.conf | |||
@@ -40,13 +40,13 @@ INITRAMFS_IMAGE = "initramfs-basic" | |||
40 | 40 | ||
41 | SYSVINIT_ENABLED_GETTYS = "1" | 41 | SYSVINIT_ENABLED_GETTYS = "1" |
42 | 42 | ||
43 | MACHINE_EXTRA_INSTALL = "\ | 43 | MACHINE_EXTRA_INSTALL += "\ |
44 | wayland \ | 44 | wayland \ |
45 | mesa-megadriver \ | 45 | mesa-megadriver \ |
46 | grub-efi-config \ | 46 | grub-efi-config \ |
47 | " | 47 | " |
48 | 48 | ||
49 | MACHINE_EXTRA_INSTALL_SDK = " \ | 49 | MACHINE_EXTRA_INSTALL_SDK += " \ |
50 | mesa-dev \ | 50 | mesa-dev \ |
51 | " | 51 | " |
52 | 52 | ||
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 07647f8..751c264 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf | |||
@@ -97,7 +97,7 @@ KERNEL_DEVICETREE += "\ | |||
97 | 97 | ||
98 | DISTRO_FEATURES_DEFAULT += "wayland" | 98 | DISTRO_FEATURES_DEFAULT += "wayland" |
99 | 99 | ||
100 | MACHINE_EXTRA_INSTALL = "\ | 100 | MACHINE_EXTRA_INSTALL += "\ |
101 | bcm4330-nvram-config \ | 101 | bcm4330-nvram-config \ |
102 | " | 102 | " |
103 | 103 | ||
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc index 802a673..fb56934 100644 --- a/conf/distro/include/raspberrypi.inc +++ b/conf/distro/include/raspberrypi.inc | |||
@@ -36,11 +36,11 @@ BOOTFS_CONTENT = "\ | |||
36 | 36 | ||
37 | BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" | 37 | BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" |
38 | 38 | ||
39 | MACHINE_EXTRA_INSTALL_SDK = " \ | 39 | MACHINE_EXTRA_INSTALL_SDK += " \ |
40 | userland-dev \ | 40 | userland-dev \ |
41 | " | 41 | " |
42 | 42 | ||
43 | MACHINE_EXTRA_INSTALL = "\ | 43 | MACHINE_EXTRA_INSTALL += "\ |
44 | userland \ | 44 | userland \ |
45 | omxplayer \ | 45 | omxplayer \ |
46 | " | 46 | " |
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc index 490bc0f..9a33319 100644 --- a/conf/distro/include/rcar-gen2.inc +++ b/conf/distro/include/rcar-gen2.inc | |||
@@ -106,7 +106,7 @@ RENESAS_WORKAROUNGS = " \ | |||
106 | libdrm-tests \ | 106 | libdrm-tests \ |
107 | " | 107 | " |
108 | 108 | ||
109 | MACHINE_EXTRA_INSTALL = " \ | 109 | MACHINE_EXTRA_INSTALL += " \ |
110 | kernel-devicetree \ | 110 | kernel-devicetree \ |
111 | libdrm-kms \ | 111 | libdrm-kms \ |
112 | libegl \ | 112 | libegl \ |
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf index 5695b1c..1089f83 100644 --- a/conf/distro/include/smarc-samx6i.conf +++ b/conf/distro/include/smarc-samx6i.conf | |||
@@ -36,7 +36,7 @@ KERNEL_IMAGETYPE = "uImage" | |||
36 | 36 | ||
37 | BOOTFS_CONTENT = " " | 37 | BOOTFS_CONTENT = " " |
38 | 38 | ||
39 | MACHINE_EXTRA_INSTALL = "\ | 39 | MACHINE_EXTRA_INSTALL += "\ |
40 | kernel-devicetree \ | 40 | kernel-devicetree \ |
41 | " | 41 | " |
42 | 42 | ||
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf index f317ca9..34d23a9 100644 --- a/conf/distro/include/tegra-t18x.conf +++ b/conf/distro/include/tegra-t18x.conf | |||
@@ -29,7 +29,7 @@ KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}' | |||
29 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}' | 29 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}' |
30 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | 30 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" |
31 | 31 | ||
32 | MACHINE_EXTRA_INSTALL = "\ | 32 | MACHINE_EXTRA_INSTALL += "\ |
33 | tegra-firmware-fecs \ | 33 | tegra-firmware-fecs \ |
34 | tegra-firmware-gmicrocode \ | 34 | tegra-firmware-gmicrocode \ |
35 | tegra-firmware-gpccs \ | 35 | tegra-firmware-gpccs \ |