diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-11-14 11:48:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:57 +0000 |
commit | 5cea09e3d010d4799eab296b2a0cb83a0af09c76 (patch) | |
tree | 9a05e73485ba61604cd8d1802f53119f750b29fa /meta-yocto-bsp/conf/machine | |
parent | 9f5e0c6040bc719e8001f213ee8b590c656d750c (diff) | |
download | poky-5cea09e3d010d4799eab296b2a0cb83a0af09c76.tar.gz |
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 <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf/machine')
-rw-r--r-- | meta-yocto-bsp/conf/machine/atom-pc.conf | 3 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 1 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/routerstationpro.conf | 1 |
3 files changed, 0 insertions, 5 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" | |||
13 | PREFERRED_VERSION_linux-yocto ?= "3.0%" | 13 | PREFERRED_VERSION_linux-yocto ?= "3.0%" |
14 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 14 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
15 | XSERVER ?= "xserver-xorg \ | 15 | XSERVER ?= "xserver-xorg \ |
16 | xserver-xorg-extension-dri2 \ | ||
17 | xserver-xorg-extension-glx \ | 16 | xserver-xorg-extension-glx \ |
18 | xserver-xorg-extension-extmod \ | ||
19 | xserver-xorg-extension-dbe \ | ||
20 | xf86-input-mouse \ | 17 | xf86-input-mouse \ |
21 | xf86-input-keyboard \ | 18 | xf86-input-keyboard \ |
22 | xf86-input-evdev \ | 19 | 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" | |||
19 | 19 | ||
20 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 20 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
21 | XSERVER ?= "xserver-xorg \ | 21 | XSERVER ?= "xserver-xorg \ |
22 | xserver-xorg-extension-extmod \ | ||
23 | xf86-input-evdev \ | 22 | xf86-input-evdev \ |
24 | xf86-video-fbdev" | 23 | xf86-video-fbdev" |
25 | 24 | ||
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%" | |||
14 | 14 | ||
15 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 15 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
16 | XSERVER ?= "xserver-xorg \ | 16 | XSERVER ?= "xserver-xorg \ |
17 | xserver-xorg-extension-extmod \ | ||
18 | xf86-input-evdev \ | 17 | xf86-input-evdev \ |
19 | xf86-video-fbdev" | 18 | xf86-video-fbdev" |
20 | 19 | ||