From ac25e473c6e037cb1b1f59b862e3f2a4ccddf33f Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 23 Aug 2017 07:57:41 +0000 Subject: [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 --- meta-rcar-gen3/conf/machine/h3ulcb.conf | 1 + meta-rcar-gen3/conf/machine/m3ulcb.conf | 1 + meta-rcar-gen3/conf/machine/salvator-x.conf | 1 + 3 files changed, 3 insertions(+) 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" -- cgit 1.2.3-korg