diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
| commit | e61ea24100067bdcd82be23607500d1acbcc91cb (patch) | |
| tree | 55433c486ae43889b43179a076624097e029ffb9 /meta/conf/distro/poky.conf | |
| parent | 3e7b691f60630bd224ab95374ddb5f3c108f645e (diff) | |
| parent | f21745fa921c1eacb9740ba4f08813a54be4ab8d (diff) | |
| download | poky-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.gz | |
Merge branch 'pli1/X11-rework' of git@moblin-mdi.jf.intel.com:poky-staging into master-dev
Diffstat (limited to 'meta/conf/distro/poky.conf')
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 1abafa5d22..4b20438368 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
| @@ -79,7 +79,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" | |||
| 79 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" | 79 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" |
| 80 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" | 80 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" |
| 81 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" | 81 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" |
| 82 | PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel | 82 | PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" |
| 83 | 83 | ||
| 84 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" | 84 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" |
| 85 | 85 | ||