summaryrefslogtreecommitdiffstats
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>2017-09-15 10:20:15 +0200
commitcd6e2a9f8195922498e82b77cd194399bb251994 (patch)
treebe8912260e0917f49d847003f55f525096c9dd75
parentdee273d75d7047abc86d34227b236da6e667db9d (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.conf3
-rw-r--r--meta-rcar-gen3/conf/machine/m3ulcb.conf3
-rw-r--r--meta-rcar-gen3/conf/machine/salvator-x.conf3
3 files changed, 6 insertions, 3 deletions
diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
index a24c221..fdfb280 100644
--- a/meta-rcar-gen3/conf/machine/h3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -36,8 +36,9 @@ PREFERRED_VERSION_u-boot = "v2015.04%"
EXTRA_IMAGEDEPENDS += " u-boot"
UBOOT_MACHINE = "h3ulcb_defconfig"
-# libdrm
+# libdrm + mesa
PREFERRED_VERSION_libdrm = "2.4.68"
+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 f8d74ec..dc58a86 100644
--- a/meta-rcar-gen3/conf/machine/m3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf
@@ -33,8 +33,9 @@ PREFERRED_VERSION_u-boot = "v2015.04%"
EXTRA_IMAGEDEPENDS += " u-boot"
UBOOT_MACHINE = "m3ulcb_defconfig"
-# libdrm
+# libdrm + mesa
PREFERRED_VERSION_libdrm = "2.4.68"
+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 57ffc9c..0b80642 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -44,8 +44,9 @@ UBOOT_MACHINE_r8a7795 = "r8a7795_salvator-x_defconfig"
# M3 u-boot configure
UBOOT_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig"
-# libdrm
+# libdrm + mesa
PREFERRED_VERSION_libdrm = "2.4.68"
+PREFERRED_VERSION_mesa = "17.%"
# Add variable to Build Configuration in build log
BUILDCFG_VARS_append = " SOC_FAMILY"