aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2017-08-23 07:57:41 +0000
committerRonan Le Martret <ronan.lemartret@iot.bzh>2018-02-16 13:52:15 +0100
commitac25e473c6e037cb1b1f59b862e3f2a4ccddf33f (patch)
tree95fa11b70e61219f2fe5c8dc9ca360c519e53c99
parent55f7540a6e49fe8389949120d2fc9827b4bc7b8c (diff)
[COMMUNITY] use mesa preferred version 17.%
This avoids a conflict between the two following options: * poky/meta/recipes-graphics/mesa/mesa_17.0.2.bb * poky/meta/recipes-graphics/mesa/mesa_git.bb Change-Id: I566ba2f5c3152efe08e9e3e883c79439813ef7ea Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
-rw-r--r--meta-rcar-gen3/conf/machine/h3ulcb.conf1
-rw-r--r--meta-rcar-gen3/conf/machine/m3ulcb.conf1
-rw-r--r--meta-rcar-gen3/conf/machine/salvator-x.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
index bb01294..d5fa600 100644
--- a/meta-rcar-gen3/conf/machine/h3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -38,6 +38,7 @@ UBOOT_MACHINE = "h3ulcb_defconfig"
# libdrm
PREFERRED_VERSION_libdrm = "2.4.85"
+PREFERRED_VERSION_mesa = "17.%"
# Add variable to Build Configuration in build log
BUILDCFG_VARS_append = " SOC_FAMILY"
diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf
index a864c29..07d9c38 100644
--- a/meta-rcar-gen3/conf/machine/m3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf
@@ -35,6 +35,7 @@ UBOOT_MACHINE = "m3ulcb_defconfig"
# libdrm
PREFERRED_VERSION_libdrm = "2.4.85"
+PREFERRED_VERSION_mesa = "17.%"
# Add variable to Build Configuration in build log
BUILDCFG_VARS_append = " SOC_FAMILY"
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
index a7f3352..1213713 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -61,6 +61,7 @@ UBOOT_MACHINE_r8a77965 = "r8a77965_salvator-x_defconfig"
# libdrm
PREFERRED_VERSION_libdrm = "2.4.85"
+PREFERRED_VERSION_mesa = "17.%"
# Add variable to Build Configuration in build log
BUILDCFG_VARS_append = " SOC_FAMILY"