diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 6 | ||||
-rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 23 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/eee901.conf | 2 |
4 files changed, 19 insertions, 13 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index d7e0a5a453..eb9f60913f 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc | |||
@@ -154,7 +154,11 @@ SRCREV_pn-usbpath = "3172" | |||
154 | SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" | 154 | SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" |
155 | SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" | 155 | SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" |
156 | SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" | 156 | SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" |
157 | SRCREV_pn-metacity-clutter ?= "389ce295417bdd99bf583026f7f1dedae29650da" | 157 | SRCREV_pn-metacity-clutter ?= "b52f1df75af8216b13539431283fd1cfaa33cf51" |
158 | SRCREV_pn-dri2proto ?= "abb1edc487543c26856afdbe6a7e2c088a1e82ee" | ||
159 | SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" | ||
160 | SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" | ||
161 | SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" | ||
158 | 162 | ||
159 | # | 163 | # |
160 | # Preferred Versions: | 164 | # Preferred Versions: |
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 29fa815686..887cc31bbc 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc | |||
@@ -18,9 +18,9 @@ PREFERRED_VERSION_fontsproto-native ?= "2.0.2" | |||
18 | PREFERRED_VERSION_gccmakedep ?= "1.0.2" | 18 | PREFERRED_VERSION_gccmakedep ?= "1.0.2" |
19 | PREFERRED_VERSION_glproto ?= "1.4.9" | 19 | PREFERRED_VERSION_glproto ?= "1.4.9" |
20 | PREFERRED_VERSION_imake ?= "1.0.2" | 20 | PREFERRED_VERSION_imake ?= "1.0.2" |
21 | PREFERRED_VERSION_inputproto ?= "1.4.4" | 21 | PREFERRED_VERSION_inputproto ?= "1.9.99.5+git${SRCREV}" |
22 | PREFERRED_VERSION_inputproto-native ?= "1.4.4" | 22 | PREFERRED_VERSION_inputproto-native ?= "1.9.99.5+git${SRCREV}" |
23 | PREFERRED_VERSION_inputproto-sdk ?= "1.4.3" | 23 | PREFERRED_VERSION_inputproto-sdk ?= "1.9.99.5+git${SRCREV}" |
24 | PREFERRED_VERSION_kbproto ?= "1.0.3" | 24 | PREFERRED_VERSION_kbproto ?= "1.0.3" |
25 | PREFERRED_VERSION_kbproto-native ?= "1.0.3" | 25 | PREFERRED_VERSION_kbproto-native ?= "1.0.3" |
26 | PREFERRED_VERSION_kbproto-sdk ?= "1.0.3" | 26 | PREFERRED_VERSION_kbproto-sdk ?= "1.0.3" |
@@ -88,8 +88,8 @@ PREFERRED_VERSION_printproto ?= "1.0.4" | |||
88 | PREFERRED_VERSION_randrproto ?= "1.2.1" | 88 | PREFERRED_VERSION_randrproto ?= "1.2.1" |
89 | PREFERRED_VERSION_randrproto-sdk ?= "1.2.1" | 89 | PREFERRED_VERSION_randrproto-sdk ?= "1.2.1" |
90 | PREFERRED_VERSION_recordproto ?= "1.13.2" | 90 | PREFERRED_VERSION_recordproto ?= "1.13.2" |
91 | PREFERRED_VERSION_renderproto ?= "0.9.2" | 91 | PREFERRED_VERSION_renderproto ?= "0.9.3" |
92 | PREFERRED_VERSION_renderproto-sdk ?= "0.9.2" | 92 | PREFERRED_VERSION_renderproto-sdk ?= "0.9.3" |
93 | PREFERRED_VERSION_resourceproto ?= "1.0.2" | 93 | PREFERRED_VERSION_resourceproto ?= "1.0.2" |
94 | PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" | 94 | PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" |
95 | PREFERRED_VERSION_trapproto ?= "3.4.3" | 95 | PREFERRED_VERSION_trapproto ?= "3.4.3" |
@@ -104,14 +104,15 @@ PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2" | |||
104 | PREFERRED_VERSION_xcmiscproto-sdk ?= "1.1.2" | 104 | PREFERRED_VERSION_xcmiscproto-sdk ?= "1.1.2" |
105 | PREFERRED_VERSION_xdpyinfo ?= "1.0.2" | 105 | PREFERRED_VERSION_xdpyinfo ?= "1.0.2" |
106 | PREFERRED_VERSION_xev ?= "1.0.3" | 106 | PREFERRED_VERSION_xev ?= "1.0.3" |
107 | PREFERRED_VERSION_xextproto ?= "7.0.2" | 107 | PREFERRED_VERSION_xextproto ?= "7.0.3" |
108 | PREFERRED_VERSION_xextproto-native ?= "7.0.2" | 108 | PREFERRED_VERSION_xextproto-native ?= "7.0.3" |
109 | PREFERRED_VERSION_xextproto-sdk ?= "7.0.2" | 109 | PREFERRED_VERSION_xextproto-sdk ?= "7.0.3" |
110 | PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" | 110 | PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" |
111 | PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" | 111 | PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" |
112 | PREFERRED_VERSION_xf86bigfontproto-sdk ?= "1.1.2" | 112 | PREFERRED_VERSION_xf86bigfontproto-sdk ?= "1.1.2" |
113 | PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" | 113 | PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" |
114 | PREFERRED_VERSION_xf86driproto ?= "2.0.3" | 114 | PREFERRED_VERSION_xf86driproto ?= "2.0.3" |
115 | PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" | ||
115 | PREFERRED_VERSION_xf86miscproto ?= "0.9.2" | 116 | PREFERRED_VERSION_xf86miscproto ?= "0.9.2" |
116 | PREFERRED_VERSION_xf86rushproto ?= "1.1.2" | 117 | PREFERRED_VERSION_xf86rushproto ?= "1.1.2" |
117 | PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" | 118 | PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" |
@@ -121,9 +122,9 @@ PREFERRED_VERSION_xineramaproto ?= "1.1.2" | |||
121 | PREFERRED_VERSION_xmodmap ?= "1.0.3" | 122 | PREFERRED_VERSION_xmodmap ?= "1.0.3" |
122 | PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" | 123 | PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" |
123 | PREFERRED_VERSION_xprop ?= "1.0.4" | 124 | PREFERRED_VERSION_xprop ?= "1.0.4" |
124 | PREFERRED_VERSION_xproto ?= "7.0.12" | 125 | PREFERRED_VERSION_xproto ?= "7.0.13" |
125 | PREFERRED_VERSION_xproto-native ?= "7.0.12" | 126 | PREFERRED_VERSION_xproto-native ?= "7.0.13" |
126 | PREFERRED_VERSION_xproto-sdk ?= "7.0.12" | 127 | PREFERRED_VERSION_xproto-sdk ?= "7.0.13" |
127 | PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" | 128 | PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" |
128 | PREFERRED_VERSION_xrandr ?= "1.2.3" | 129 | PREFERRED_VERSION_xrandr ?= "1.2.3" |
129 | PREFERRED_VERSION_xrdb ?= "1.0.5" | 130 | PREFERRED_VERSION_xrdb ?= "1.0.5" |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index efa6845dfc..09d86f1d2e 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -79,6 +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 | 83 | ||
83 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" | 84 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" |
84 | 85 | ||
diff --git a/meta/conf/machine/eee901.conf b/meta/conf/machine/eee901.conf index f6dbe333aa..54f630d56c 100644 --- a/meta/conf/machine/eee901.conf +++ b/meta/conf/machine/eee901.conf | |||
@@ -17,7 +17,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-moblin" | |||
17 | PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" | 17 | PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" |
18 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" | 18 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" |
19 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite" | 19 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite" |
20 | XSERVER = "xserver-xf86-dri-lite \ | 20 | XSERVER ?= "xserver-xf86-dri-lite \ |
21 | xf86-input-mouse \ | 21 | xf86-input-mouse \ |
22 | xf86-input-keyboard \ | 22 | xf86-input-keyboard \ |
23 | xf86-input-synaptics \ | 23 | xf86-input-synaptics \ |