diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-10 16:57:28 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-11 07:57:30 +0000 |
commit | 415e9f875b9c153c62883b5177bf836e722e8800 (patch) | |
tree | e8e1ae56c35ef8476e03269aa6be3caa38d1dad7 /conf/distro/include | |
parent | 7f9285cfbb79906d1ca96ef9db3b2e0ce16aa3ec (diff) | |
download | meta-boot2qt-415e9f875b9c153c62883b5177bf836e722e8800.tar.gz |
Always append to MACHINE_EXTRA_INSTALL
Packages are added to MACHINE_EXTRA_INSTALL in multiple places,
make sure we always append. This adds back the missing gst plugins
to nitrogen6x.
Change-Id: I7c424b37d84b0125b74774fd308926e53e031590
Reviewed-by: Risto Avila <risto.avila@qt.io>
Diffstat (limited to 'conf/distro/include')
-rw-r--r-- | conf/distro/include/am335x-evm.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/beagleboard.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/beaglebone.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/nvidia-logan.conf | 4 | ||||
-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 |
13 files changed, 22 insertions, 22 deletions
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 12f8a57..4f90a0e 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf | |||
@@ -47,12 +47,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" | |||
47 | PREFERRED_VERSION_libgles-omap3 = "5.01.01.02" | 47 | PREFERRED_VERSION_libgles-omap3 = "5.01.01.02" |
48 | PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02" | 48 | PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02" |
49 | 49 | ||
50 | MACHINE_EXTRA_INSTALL = "\ | 50 | MACHINE_EXTRA_INSTALL += "\ |
51 | libgles-omap3 \ | 51 | libgles-omap3 \ |
52 | libgles-omap3-rawdemos \ | 52 | libgles-omap3-rawdemos \ |
53 | lighttpd \ | 53 | lighttpd \ |
54 | " | 54 | " |
55 | 55 | ||
56 | MACHINE_EXTRA_INSTALL_SDK = "\ | 56 | MACHINE_EXTRA_INSTALL_SDK += "\ |
57 | libgles-omap3-dev \ | 57 | libgles-omap3-dev \ |
58 | " | 58 | " |
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/beaglebone.conf b/conf/distro/include/beaglebone.conf index da4ed1c..54455a3 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf | |||
@@ -53,12 +53,12 @@ EXTRA_IMAGEDEPENDS_remove = "u-boot-denx" | |||
53 | UBOOT_MACHINE = "am335x_boneblack_config" | 53 | UBOOT_MACHINE = "am335x_boneblack_config" |
54 | KERNEL_IMAGETYPE = "zImage" | 54 | KERNEL_IMAGETYPE = "zImage" |
55 | 55 | ||
56 | MACHINE_EXTRA_INSTALL = "\ | 56 | MACHINE_EXTRA_INSTALL += "\ |
57 | libgles-omap3 \ | 57 | libgles-omap3 \ |
58 | libgles-omap3-rawdemos \ | 58 | libgles-omap3-rawdemos \ |
59 | " | 59 | " |
60 | 60 | ||
61 | MACHINE_EXTRA_INSTALL_SDK = "\ | 61 | MACHINE_EXTRA_INSTALL_SDK += "\ |
62 | libgles-omap3-dev \ | 62 | libgles-omap3-dev \ |
63 | " | 63 | " |
64 | 64 | ||
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 6b2c5bf..002e0e0 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -52,10 +52,10 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | |||
52 | 52 | ||
53 | DISTRO_FEATURES_remove = "webengine" | 53 | DISTRO_FEATURES_remove = "webengine" |
54 | 54 | ||
55 | MACHINE_EXTRA_INSTALL = "\ | 55 | MACHINE_EXTRA_INSTALL += "\ |
56 | opengldummy \ | 56 | opengldummy \ |
57 | " | 57 | " |
58 | 58 | ||
59 | MACHINE_EXTRA_INSTALL_SDK = "\ | 59 | MACHINE_EXTRA_INSTALL_SDK += "\ |
60 | opengldummy-dev \ | 60 | opengldummy-dev \ |
61 | " | 61 | " |
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 511deab..bfe29bf 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf | |||
@@ -99,7 +99,7 @@ KERNEL_DEVICETREE += "\ | |||
99 | 99 | ||
100 | DISTRO_FEATURES_DEFAULT += "wayland" | 100 | DISTRO_FEATURES_DEFAULT += "wayland" |
101 | 101 | ||
102 | MACHINE_EXTRA_INSTALL = "\ | 102 | MACHINE_EXTRA_INSTALL += "\ |
103 | bcm4330-nvram-config \ | 103 | bcm4330-nvram-config \ |
104 | " | 104 | " |
105 | 105 | ||
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf index 0f932c2..632e31b 100644 --- a/conf/distro/include/nvidia-logan.conf +++ b/conf/distro/include/nvidia-logan.conf | |||
@@ -35,7 +35,7 @@ KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-v | |||
35 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' | 35 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' |
36 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | 36 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" |
37 | 37 | ||
38 | MACHINE_EXTRA_INSTALL = "\ | 38 | MACHINE_EXTRA_INSTALL += "\ |
39 | libegl \ | 39 | libegl \ |
40 | libgles2 \ | 40 | libgles2 \ |
41 | tegra-firmware-gk20a \ | 41 | tegra-firmware-gk20a \ |
@@ -43,7 +43,7 @@ MACHINE_EXTRA_INSTALL = "\ | |||
43 | libdrm-nv \ | 43 | libdrm-nv \ |
44 | " | 44 | " |
45 | 45 | ||
46 | MACHINE_EXTRA_INSTALL_SDK = "\ | 46 | MACHINE_EXTRA_INSTALL_SDK += "\ |
47 | libegl-dev \ | 47 | libegl-dev \ |
48 | libgles2-dev \ | 48 | libgles2-dev \ |
49 | graphics-headers-dev \ | 49 | graphics-headers-dev \ |
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc index 10b11a3..0833404 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 f196ad5..9b638c3 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 95388b6..7c441ff 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 baf7f5c..50ed829 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/vibrante-t186ref-linux")}' | 29 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}' |
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 \ |