From 5cea09e3d010d4799eab296b2a0cb83a0af09c76 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 14 Nov 2012 11:48:41 +0200 Subject: [PATCH] yocto-bsp: update configs after xorg upgrade There were some changes in the xserver-xorg upstream project that need to be reflected here too: * extmod module was removed completely as it became empty; * DRI1, DRI2, DBE (among others) were made built-in; (From meta-yocto rev: ed681441a2cf06dc55e71035ecbfc637ff83640d) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/atom-pc.conf | 3 --- meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 1 - meta-yocto-bsp/conf/machine/routerstationpro.conf | 1 - .../target/arch/powerpc/conf/machine/{{=machine}}.conf | 1 - 4 files changed, 6 deletions(-) diff --git a/meta-yocto-bsp/conf/machine/atom-pc.conf b/meta-yocto-bsp/conf/machine/atom-pc.conf index 46bc71b75d..77dd7fbe43 100644 --- a/meta-yocto-bsp/conf/machine/atom-pc.conf +++ b/meta-yocto-bsp/conf/machine/atom-pc.conf @@ -13,10 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "3.0%" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri2 \ xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ xf86-input-mouse \ xf86-input-keyboard \ xf86-input-evdev \ diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index 7aa498dccd..252f4cc36b 100644 --- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf @@ -19,7 +19,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-extmod \ xf86-input-evdev \ xf86-video-fbdev" diff --git a/meta-yocto-bsp/conf/machine/routerstationpro.conf b/meta-yocto-bsp/conf/machine/routerstationpro.conf index feaa26e7c4..e5e4d1a338 100644 --- a/meta-yocto-bsp/conf/machine/routerstationpro.conf +++ b/meta-yocto-bsp/conf/machine/routerstationpro.conf @@ -14,7 +14,6 @@ PREFERRED_VERSION_linux-yocto ?= "3.4%" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-extmod \ xf86-input-evdev \ xf86-video-fbdev" diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf index cbf3c32c01..1d6143a00c 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf @@ -43,7 +43,6 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" {{ if xserver == "y": }} PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ - xserver-xorg-extension-extmod \ xf86-input-evdev \ xf86-video-fbdev"