summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-07-19 14:16:08 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-08-04 11:12:26 +0200
commit8f8dd26164be5a658935f47f7c4e3b94e995d357 (patch)
treea12c683b8381ece518f5865c135f5196060dd98b /conf
parentb81ada92f81edd21f5d9917f44d1a2588cbefc33 (diff)
machine.conf: xserver: make sure to use machine specific
If the package manager finds a version newer than the prefered-version that one gets installed. As we need a specific one for the tegras and for imx6 we change the 'epoch' to something very high.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/apalis-imx6.conf2
-rw-r--r--conf/machine/colibri-vf.conf5
2 files changed, 7 insertions, 0 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 10e7fc8..1224cdf 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -13,6 +13,8 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
+PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%"
+
# Ensure boot scripts will be available at rootfs time
#do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 2edaeaa..0b85319 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -17,6 +17,11 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
UBOOT_SUFFIX = "imx"
UBOOT_MAKE_TARGET = ""
UBOOT_MACHINE = "colibri_vf_config"
+
+#All other Toradex modules require version 1.14, so stay with it also with the VF modules
+PREFERRED_PROVIDER_virtual/xserver_vf = "xserver-xorg"
+PREFERRED_VERSION_xserver-xorg_vf = "1.14%"
+
# note that this is a pure SW solution, don't expect GPU performance
PREFERRED_PROVIDER_virtual/mesa = "mesa"
PREFERRED_PROVIDER_virtual/gl = "mesa"