diff options
author | Richard Purdie <richard@openedhand.com> | 2006-02-10 14:33:55 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-02-10 14:33:55 +0000 |
commit | 5fb35ca11147ed30c619cf93e19331fd835f3da9 (patch) | |
tree | 45f05442e8a91453bfea03a29fb3cb96f49d80e5 /openembedded/conf | |
parent | 42dfbb2a0223ba5d091f053ad5401ecce6446e41 (diff) | |
download | poky-5fb35ca11147ed30c619cf93e19331fd835f3da9.tar.gz |
Apply more chanegs from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
-rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions-2.7.inc | 32 | ||||
-rw-r--r-- | openembedded/conf/machine/include/zaurus-clamshell-2.6.conf | 9 |
2 files changed, 20 insertions, 21 deletions
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc index f8af96435b..933195977d 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc | |||
@@ -20,13 +20,15 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" | |||
20 | PREFERRED_VERSION_atk ?= "1.9.0" | 20 | PREFERRED_VERSION_atk ?= "1.9.0" |
21 | PREFERRED_VERSION_cairo ?= "0.5.2" | 21 | PREFERRED_VERSION_cairo ?= "0.5.2" |
22 | PREFERRED_VERSION_glib-2.0 ?= "2.6.4" | 22 | PREFERRED_VERSION_glib-2.0 ?= "2.6.4" |
23 | PREFERRED_VERSION_gtk+ ?= "2.6.7" | 23 | PREFERRED_VERSION_gtk+ ?= "2.6.10" |
24 | PREFERRED_VERSION_pango ?= "1.8.1" | 24 | PREFERRED_VERSION_pango ?= "1.8.1" |
25 | PREFERRED_VERSION_librsvg ?= "2.6.5" | 25 | PREFERRED_VERSION_librsvg ?= "2.6.5" |
26 | PREFERRED_VERSION_libgpewidget ?= "0.105" | 26 | PREFERRED_VERSION_libgpewidget ?= "0.109" |
27 | PREFERRED_VERSION_libgpepimc ?= "0.5" | 27 | PREFERRED_VERSION_libgpepimc ?= "0.5" |
28 | PREFERRED_VERSION_libgpevtype ?= "0.14" | 28 | PREFERRED_VERSION_libgpevtype ?= "0.14" |
29 | PREFERRED_VERSION_libschedule ?= "0.15" | 29 | PREFERRED_VERSION_libschedule ?= "0.15" |
30 | PREFERRED_VERSION_libcontactsdb ?= "0.3" | ||
31 | PREFERRED_VERSION_libtododb ?= "0.09" | ||
30 | PREFERRED_VERSION_gpe-icons ?= "0.25" | 32 | PREFERRED_VERSION_gpe-icons ?= "0.25" |
31 | PREFERRED_VERSION_libgsm ?= "1.0.10" | 33 | PREFERRED_VERSION_libgsm ?= "1.0.10" |
32 | PREFERRED_VERSION_diet-x11 ?= "6.2.1" | 34 | PREFERRED_VERSION_diet-x11 ?= "6.2.1" |
@@ -43,23 +45,23 @@ PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" | |||
43 | PREFERRED_VERSION_gpe-login ?= "0.83" | 45 | PREFERRED_VERSION_gpe-login ?= "0.83" |
44 | PREFERRED_VERSION_gpe-session-scripts ?= "0.66" | 46 | PREFERRED_VERSION_gpe-session-scripts ?= "0.66" |
45 | PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" | 47 | PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" |
46 | PREFERRED_VERSION_gpe-todo ?= "0.54" | 48 | PREFERRED_VERSION_gpe-todo ?= "0.55" |
47 | PREFERRED_VERSION_gpe-calendar ?= "0.66" | 49 | PREFERRED_VERSION_gpe-calendar ?= "0.70" |
48 | PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" | 50 | PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" |
49 | PREFERRED_VERSION_gpe-contacts ?= "0.42" | 51 | PREFERRED_VERSION_gpe-contacts ?= "0.43" |
50 | PREFERRED_VERSION_gpe-today ?= "0.10" | 52 | PREFERRED_VERSION_gpe-today ?= "0.10" |
51 | PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" | 53 | PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" |
52 | PREFERRED_VERSION_dbus ?= "0.23.4" | 54 | PREFERRED_VERSION_dbus ?= "0.23.4" |
53 | PREFERRED_VERSION_gpe-beam ?= "0.2.8" | 55 | PREFERRED_VERSION_gpe-beam ?= "0.2.8" |
54 | PREFERRED_VERSION_gpe-bluetooth ?= "0.47" | 56 | PREFERRED_VERSION_gpe-bluetooth ?= "0.51" |
55 | PREFERRED_VERSION_gpe-su ?= "0.19" | 57 | PREFERRED_VERSION_gpe-su ?= "0.19" |
56 | PREFERRED_VERSION_gpe-conf ?= "0.1.26" | 58 | PREFERRED_VERSION_gpe-conf ?= "0.1.29" |
57 | PREFERRED_VERSION_gpe-clock ?= "0.21" | 59 | PREFERRED_VERSION_gpe-clock ?= "0.23" |
58 | PREFERRED_VERSION_gpe-mininet ?= "0.5" | 60 | PREFERRED_VERSION_gpe-mininet ?= "0.7" |
59 | PREFERRED_VERSION_gpe-mixer ?= "0.42" | 61 | PREFERRED_VERSION_gpe-mixer ?= "0.42" |
60 | PREFERRED_VERSION_gpe-shield ?= "0.8" | 62 | PREFERRED_VERSION_gpe-shield ?= "0.8" |
61 | PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" | 63 | PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" |
62 | PREFERRED_VERSION_gpe-taskmanager ?= "0.18" | 64 | PREFERRED_VERSION_gpe-taskmanager ?= "0.19" |
63 | PREFERRED_VERSION_keylaunch ?= "2.0.7" | 65 | PREFERRED_VERSION_keylaunch ?= "2.0.7" |
64 | PREFERRED_VERSION_minilite ?= "0.49" | 66 | PREFERRED_VERSION_minilite ?= "0.49" |
65 | PREFERRED_VERSION_xmonobut ?= "0.4" | 67 | PREFERRED_VERSION_xmonobut ?= "0.4" |
@@ -70,7 +72,7 @@ PREFERRED_VERSION_gpe-package ?= "0.3" | |||
70 | PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" | 72 | PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" |
71 | PREFERRED_VERSION_gpe-terminal ?= "1.1" | 73 | PREFERRED_VERSION_gpe-terminal ?= "1.1" |
72 | PREFERRED_VERSION_gpe-watch ?= "0.10" | 74 | PREFERRED_VERSION_gpe-watch ?= "0.10" |
73 | PREFERRED_VERSION_gpe-what ?= "0.33" | 75 | PREFERRED_VERSION_gpe-what ?= "0.42" |
74 | PREFERRED_VERSION_gpe-filemanager ?= "0.23" | 76 | PREFERRED_VERSION_gpe-filemanager ?= "0.23" |
75 | PREFERRED_VERSION_gpe-go ?= "0.05" | 77 | PREFERRED_VERSION_gpe-go ?= "0.05" |
76 | PREFERRED_VERSION_gpe-irc ?= "0.07" | 78 | PREFERRED_VERSION_gpe-irc ?= "0.07" |
@@ -84,11 +86,11 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1" | |||
84 | PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" | 86 | PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" |
85 | PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" | 87 | PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" |
86 | PREFERRED_VERSION_dillo2 ?= "0.6.6" | 88 | PREFERRED_VERSION_dillo2 ?= "0.6.6" |
87 | PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" | 89 | PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" |
88 | PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" | 90 | PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" |
89 | PREFERRED_VERSION_linphone ?= "0.12.2" | 91 | PREFERRED_VERSION_linphone ?= "0.12.2" |
90 | PREFERRED_VERSION_firefox ?= "1.0" | 92 | PREFERRED_VERSION_firefox ?= "1.0" |
91 | PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" | 93 | PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1" |
92 | PREFERRED_VERSION_poppler ?= "0.3.3" | 94 | PREFERRED_VERSION_poppler ?= "0.3.3" |
93 | PREFERRED_VERSION_evince ?= "0.3.2" | 95 | PREFERRED_VERSION_evince ?= "0.3.2" |
94 | PREFERRED_VERSION_gpe_mini_browser ?= "0.17" | 96 | PREFERRED_VERSION_gpe_mini_browser ?= "0.19" |
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf index 007750a39b..271a6ca3e7 100644 --- a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | 3 | ||
4 | PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" | 4 | PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" |
5 | 5 | ||
6 | BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \ | ||
7 | pcmciautils apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ | ||
8 | ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib" | ||
9 | |||
10 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ | 6 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ |
11 | pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ | 7 | pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ |
12 | ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" | 8 | ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" |
@@ -36,12 +32,13 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage | |||
36 | # Wireless Modules | 32 | # Wireless Modules |
37 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ | 33 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ |
38 | kernel-module-hermes kernel-module-orinoco \ | 34 | kernel-module-hermes kernel-module-orinoco \ |
39 | kernel-module-orinoco-cs kernel-module-spectrum-cs" | 35 | kernel-module-orinoco-cs kernel-module-spectrum-cs \ |
36 | hostap-conf orinoco-conf" | ||
40 | 37 | ||
41 | # Sound Modules | 38 | # Sound Modules |
42 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ | 39 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ |
43 | kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \ | 40 | kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \ |
44 | kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" | 41 | kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" |
45 | BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " | 42 | BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " |
46 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " | 43 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " |
47 | BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " | 44 | BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " |