diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2009-04-14 15:56:47 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2009-04-14 15:56:47 +0200 |
| commit | ff97dad855526c3b28d8064582a7eea4c31c0602 (patch) | |
| tree | e1e5453813e8d28cb3801cc44e059eec65ab294b /conf | |
| parent | 1f05937e03c5faadd182b27df700c2dc3660a5ab (diff) | |
| parent | 1c1e92afe0373f90d66052efa6b59fe063697ce1 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 11 | ||||
| -rw-r--r-- | conf/machine/palmt650.conf | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 5cb20101a5..e3e21872b7 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1326,7 +1326,7 @@ PREFERRED_VERSION_net-snmp ?= "5.4.1" PREFERRED_VERSION_net-tools ?= "1.60" PREFERRED_VERSION_network-manager-applet ?= "0.6.5" PREFERRED_VERSION_network-suspend-scripts ?= "1.1" -PREFERRED_VERSION_nfs-utils ?= "1.0.6" +PREFERRED_VERSION_nfs-utils ?= "1.1.2" PREFERRED_VERSION_ngrep ?= "1.42" PREFERRED_VERSION_nis-all ?= "1.0" PREFERRED_VERSION_nkf ?= "2.07" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d606b51f0f..5fe5936f57 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,7 +42,7 @@ SRCREV_pn-eds-dbus ?= "736" SRCREV_pn-eglibc ?= "8139" SRCREV_pn-eglibc-initial ?= "8139" SRCREV_pn-enlazar ?= "37" -SRCREV_pn-essential-dialer ?= "60" +SRCREV_pn-essential-dialer ?= "111" SRCREV_pn-exalt ?= "79" SRCREV_pn-exalt-daemon ?= "78" SRCREV_pn-exalt-module ?= "78" @@ -88,7 +88,7 @@ SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libeflvala ?= "788101c237133747ee330142b4900774dd282a7c" -SRCREV_pn-libefso ?= "60" +SRCREV_pn-libefso ?= "111" SRCREV_pn-libexalt ?= "78" SRCREV_pn-libexalt-dbus ?= "76" SRCREV_pn-libfakekey ?= "1455" @@ -257,7 +257,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "39886" +EFL_SRCREV ?= "39916" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" @@ -309,6 +309,7 @@ SRCREV_pn-edje-editor ?= "${EFL_SRCREV}" SRCREV_pn-edje-player ?= "${EFL_SRCREV}" SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}" SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}" +SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}" SRCREV_pn-emphasis ?= "${EFL_SRCREV}" SRCREV_pn-ephoto ?= "${EFL_SRCREV}" SRCREV_pn-examine ?= "${EFL_SRCREV}" @@ -326,3 +327,7 @@ SRCREV_pn-rage ?= "${EFL_SRCREV}" SRCREV_pn-illume ?= "${EFL_SRCREV}" SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}" SRCREV_pn-waker ?= "${EFL_SRCREV}" + +# Swisstelecom E stuff +SRCREV_pn-libefso ?= "60" +SRCREV_pn-essential-dialer ?= "60" diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index 272c0dca1c..f81ade3d2e 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -12,6 +12,9 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \ kernel-module-pxa27x-keyboard \ - kernel-module-wm97xx-ts" + kernel-module-wm97xx-ts \ + " + +MACHINE_EXTRA_RDEPENDS += "palmt650-keyboard-modmap" module_autoload_g_ether = "g_ether" |