From b304742af7229d818eab5d214cf0b02ac8052d70 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 19 Mar 2013 18:29:49 +0200 Subject: scripts/lib/bsp: replace mesa-dri with mesa in machine.conf files mesa-dri has been renamed to mesa. [YOCTO #3385] (From meta-yocto rev: ba8d5b6dcb6fa4721e85b62f15713072cc0fa23f) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- .../bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 2 +- .../bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf index 268ddc82d4..78a753c3df 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf @@ -58,7 +58,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} PREFERRED_VERSION_xserver-xorg ?= "1.9.3" -PREFERRED_VERSION_mesa-dri ?= "9.0.2" +PREFERRED_VERSION_mesa ?= "9.0.2" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" PREFERRED_VERSION_emgd-driver-bin ?= "1.16" diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf index dd7b97e162..9ab0bf410c 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf @@ -16,9 +16,9 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" {{ if qemuarch == "i386" or qemuarch == "x86_64": }} PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" {{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }} {{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }} @@ -47,7 +47,7 @@ SERIAL_CONSOLE = "115200 ttyS0" # We bypass swrast but we need it to be present for X to load correctly XSERVER ?= "xserver-xorg \ - mesa-dri-driver-swrast \ + mesa-driver-swrast \ xf86-input-vmmouse \ xf86-input-keyboard \ xf86-input-evdev \ -- cgit v1.2.3-54-g00ecf