diff options
| author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-01-02 16:00:40 +0100 |
|---|---|---|
| committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-01-02 16:00:40 +0100 |
| commit | 6690b8fcee9bc9152948b9a623117dd62bcf45de (patch) | |
| tree | 7b4f0de615dbf0babda5ef09b78d81dde77d89d7 /conf/machine | |
| parent | 29c63b640c4e4c852cf3084232ef67c8fd9d3214 (diff) | |
| parent | 6d5a96970227b845b6a33380e3e7af248cca7594 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/om-gta02.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index c65d971144..12cea679a8 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -15,8 +15,9 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -MACHINE_DRI_MODULES = "glamo" +PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +# Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6 +MACHINE_DRI_MODULES_shr = "glamo" XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse" |