From 415e9f875b9c153c62883b5177bf836e722e8800 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 10 Oct 2016 16:57:28 +0300 Subject: 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 --- conf/distro/include/am335x-evm.conf | 4 ++-- conf/distro/include/beagleboard.conf | 4 ++-- conf/distro/include/beaglebone.conf | 4 ++-- conf/distro/include/colibri-vf.conf | 4 ++-- conf/distro/include/emulator.conf | 4 ++-- conf/distro/include/imx7dsabresd.conf | 4 ++-- conf/distro/include/intel-corei7-64.conf | 4 ++-- conf/distro/include/nitrogen6x.conf | 2 +- conf/distro/include/nvidia-logan.conf | 4 ++-- conf/distro/include/raspberrypi.inc | 4 ++-- conf/distro/include/rcar-gen2.inc | 2 +- conf/distro/include/smarc-samx6i.conf | 2 +- 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" PREFERRED_VERSION_libgles-omap3 = "5.01.01.02" PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libgles-omap3 \ libgles-omap3-rawdemos \ lighttpd \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libgles-omap3-dev \ " 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" PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libgles-omap3 \ libgles-omap3-rawdemos \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libgles-omap3-dev \ " 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" UBOOT_MACHINE = "am335x_boneblack_config" KERNEL_IMAGETYPE = "zImage" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libgles-omap3 \ libgles-omap3-rawdemos \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libgles-omap3-dev \ " 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" DISTRO_FEATURES_remove = "webengine" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ opengldummy \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ opengldummy-dev \ " 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" DISTRO_FEATURES_remove = "webengine opengl" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ mount-vboxsf \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ qtglesstream-dummy-client-dev \ " 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" DISTRO_FEATURES_remove = "webengine" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ " 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" SYSVINIT_ENABLED_GETTYS = "1" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ wayland \ mesa-megadriver \ grub-efi-config \ " -MACHINE_EXTRA_INSTALL_SDK = " \ +MACHINE_EXTRA_INSTALL_SDK += " \ mesa-dev \ " 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 += "\ DISTRO_FEATURES_DEFAULT += "wayland" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ bcm4330-nvram-config \ " 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 PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libegl \ libgles2 \ tegra-firmware-gk20a \ @@ -43,7 +43,7 @@ MACHINE_EXTRA_INSTALL = "\ libdrm-nv \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libegl-dev \ libgles2-dev \ 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 = "\ BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" -MACHINE_EXTRA_INSTALL_SDK = " \ +MACHINE_EXTRA_INSTALL_SDK += " \ userland-dev \ " -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ userland \ omxplayer \ " 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 = " \ libdrm-tests \ " -MACHINE_EXTRA_INSTALL = " \ +MACHINE_EXTRA_INSTALL += " \ kernel-devicetree \ libdrm-kms \ 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" BOOTFS_CONTENT = " " -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ kernel-devicetree \ " 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")}' PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}' NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ tegra-firmware-fecs \ tegra-firmware-gmicrocode \ tegra-firmware-gpccs \ -- cgit v1.2.3-54-g00ecf