From: Gary Thomas Date: Tue, 16 Jun 2015 13:08:51 +0000 (-0600) Subject: imx-gpu-viv: Avoid duplicate values in PROVIDES X-Git-Tag: 2.1~562 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c9966e491a9346bcd3e7b89cf6daacbcdd54f034;p=meta-freescale.git imx-gpu-viv: Avoid duplicate values in PROVIDES Additional packages are added to the PROVIDES variable, depending on the type of processor being supported, e.g. i.MX6Q, i.MX6SX, etc. The old way this was being set could add multiple versions of the same package to the PROVIDES variable which in turn can cause confusion with sstate, e.g. a number of i.MX6 machines use :mx6q:mx6dl in their overrides whereas others might only have :mx6q. With the previous setting of PROVIDES, this package would not be sharable via sstate between such machines. This patch changes the process so that these extra packages are only added once, improving the [re]usability of sstate. Signed-off-by: Gary Thomas Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc index ea19292d..4b6e030e 100644 --- a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc +++ b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc @@ -11,10 +11,11 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamag base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \ '', d), d)}" -PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d" -PROVIDES_append_mx6q = " virtual/libgl virtual/libgles1 virtual/libgles2" -PROVIDES_append_mx6dl = " virtual/libgl virtual/libgles1 virtual/libgles2" -PROVIDES_append_mx6sx = " virtual/libgl virtual/libgles1 virtual/libgles2" +EXTRA_PROVIDES = "" +EXTRA_PROVIDES_mx6q = " virtual/libgl virtual/libgles1 virtual/libgles2" +EXTRA_PROVIDES_mx6dl = " virtual/libgl virtual/libgles1 virtual/libgles2" +EXTRA_PROVIDES_mx6sx = " virtual/libgl virtual/libgles1 virtual/libgles2" +PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}" PE = "1"