diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:28:42 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:28:42 +0100 |
| commit | fd265c020e524366c8db69fbedd2cf0bad471324 (patch) | |
| tree | 290f32591a3ac0501061621238384e6da98bd09e /conf | |
| parent | 58884fc059504abafc9126613a7049464ba701e7 (diff) | |
| parent | fdb5cf6eed330eeaf173afd3f0101e01b0c2ede1 (diff) | |
| download | openembedded-fd265c020e524366c8db69fbedd2cf0bad471324.tar.gz | |
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts:
conf/machine/om-gta01.conf
recipes/mesa/mesa-dri_git.bb
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/om-gta01.conf | 2 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 1e1c8612f8..e1c5127072 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev" -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl = "mesa" XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 5fc96ec4ed..8e8355ba6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -15,8 +15,8 @@ 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_shr = "mesa-dri" -MACHINE_DRI_MODULES_shr = "glamo" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" +MACHINE_DRI_MODULES = "glamo" XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse" |