diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-07-19 14:16:08 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-08-04 11:12:26 +0200 |
| commit | 00734e810785e7cfed4b28feede2deaa85ffb202 (patch) | |
| tree | f921feb03bdeb071680a50c09419c1b5ca607264 /conf | |
| parent | 853f11f247b96a0cd34c9fe876588b591c86070b (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.conf | 2 | ||||
| -rw-r--r-- | conf/machine/apalis-t30.conf | 4 | ||||
| -rw-r--r-- | conf/machine/colibri-t20.conf | 4 | ||||
| -rw-r--r-- | conf/machine/colibri-t30.conf | 4 | ||||
| -rw-r--r-- | conf/machine/colibri-vf.conf | 5 |
5 files changed, 13 insertions, 6 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/apalis-t30.conf b/conf/machine/apalis-t30.conf index b47fd3c..461c5b1 100644 --- a/conf/machine/apalis-t30.conf +++ b/conf/machine/apalis-t30.conf @@ -16,8 +16,8 @@ UBOOT_ENTRYPOINT = "0x82008000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" KEEPUIMAGE = "" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_VERSION_xserver-xorg_apalis-t30 = "1.14.4" +PREFERRED_PROVIDER_virtual/xserver_tegra = "xserver-xorg" +PREFERRED_VERSION_xserver-xorg_tegra = "99:1.14%" XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf index dc97caa..e251e47 100644 --- a/conf/machine/colibri-t20.conf +++ b/conf/machine/colibri-t20.conf @@ -14,8 +14,8 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" UBOOT_MACHINE = "colibri_t20_config" UBOOT_ENTRYPOINT = "0x00008000" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_VERSION_xserver-xorg_colibri-t20 = "1.14.4" +PREFERRED_PROVIDER_virtual/xserver_tegra = "xserver-xorg" +PREFERRED_VERSION_xserver-xorg_tegra = "99:1.14%" XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf index b6ca840..a7eaded 100644 --- a/conf/machine/colibri-t30.conf +++ b/conf/machine/colibri-t30.conf @@ -16,8 +16,8 @@ UBOOT_ENTRYPOINT = "0x82008000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" KEEPUIMAGE = "" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_VERSION_xserver-xorg_colibri-t30 = "1.14.4" +PREFERRED_PROVIDER_virtual/xserver_tegra = "xserver-xorg" +PREFERRED_VERSION_xserver-xorg_tegra = "99:1.14%" XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ 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" |