[oe-commits] org.oe.dev merge of 'acaec69cff5e01d75fc25fc008a3647d4276e23a'

[john_lee commit]

merge of 'acaec69cff5e01d75fc25fc008a3647d4276e23a'
     and 'fbdf8a106f5161fd714dd92d53cf8bd31fa6d8ea'

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 5832c7c5be46599da8552b5edb54111b13dea59c
ViewMTN: http://monotone.openembedded.org/revision/info/5832c7c5be46599da8552b5edb54111b13dea59c
Files:
1
packages/linux/linux-openmoko-devel_2.6.24.bb
conf/distro/openmoko.conf
packages/tasks/task-openmoko-feed.bb
Diffs:

#
# mt diff -racaec69cff5e01d75fc25fc008a3647d4276e23a -r5832c7c5be46599da8552b5edb54111b13dea59c
#
#
#
# patch "packages/linux/linux-openmoko-devel_2.6.24.bb"
#  from [d736a034f3b6a782d3e0766801f7546e708a0789]
#    to [96ff722817d2fafc8b922e1d297c9641b7646a86]
#
============================================================
--- packages/linux/linux-openmoko-devel_2.6.24.bb	d736a034f3b6a782d3e0766801f7546e708a0789
+++ packages/linux/linux-openmoko-devel_2.6.24.bb	96ff722817d2fafc8b922e1d297c9641b7646a86
@@ -26,7 +26,6 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}
 ##############################################################
 # kernel image resides on a seperate flash partition (for now)
 #
-FILES_kernel-image = ""
 ALLOW_EMPTY = "1"
 
 COMPATIBLE_HOST = "arm.*-linux"


#
# mt diff -rfbdf8a106f5161fd714dd92d53cf8bd31fa6d8ea -r5832c7c5be46599da8552b5edb54111b13dea59c
#
#
#
# patch "conf/distro/openmoko.conf"
#  from [289ae1d49d8fded742aae514c40553218bfb1216]
#    to [c3790857c327564ffe9af4dbd0035ba78556c4f9]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [a17a728108a5a6dafd658e24000125a8df8686d3]
#    to [bee31a249ca7da0543aa20df44b75bf3c005274e]
#
============================================================
--- conf/distro/openmoko.conf	289ae1d49d8fded742aae514c40553218bfb1216
+++ conf/distro/openmoko.conf	c3790857c327564ffe9af4dbd0035ba78556c4f9
@@ -63,6 +63,8 @@ PREFERRED_VERSION_gtk+-fastscaling = "2.
 # Select package versions we want to use.
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_asterisk = "1.4.17"
 
 # for jalimo
 PREFERRED_PROVIDER_classpath = "classpath"
============================================================
--- packages/tasks/task-openmoko-feed.bb	a17a728108a5a6dafd658e24000125a8df8686d3
+++ packages/tasks/task-openmoko-feed.bb	bee31a249ca7da0543aa20df44b75bf3c005274e
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r21"
+PR = "r22"
 
 inherit task
 
@@ -36,4 +36,6 @@ RDEPENDS_task-openmoko-feed = "\
   x11vnc \
   libswt3.4-gtk-java \
   cacao \
+  gpsdrive \
+  asterisk \
 "