merge of 'af7a343c3ca25a52091ecf007623fd2fb44c00c4'

     and 'f577bf24ed1f64944d7a13b76d83ea9427dda913'

2 files changed, 4 insertions, 5 deletions

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 63fcec904f..611396b872 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r27"
+PR = "r30"
 
 inherit task
 
@@ -9,7 +9,6 @@ RDEPENDS_task-openmoko-feed = "\
   aspell enchant \
   openmoko-agpsui \
   gypsy \
-  py-odeviced \
   gsm0710muxd \
   ppp \
   bluez-hcidump \
@@ -17,6 +16,7 @@ RDEPENDS_task-openmoko-feed = "\
   eet evas ecore embryo epsilon edje efreet emotion epdf \
   exhibit edje-viewer \
   free42-vga \
+  git \
   gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \
   ipkg-link ipkg-utils \
   joe \
@@ -26,11 +26,10 @@ RDEPENDS_task-openmoko-feed = "\
   mplayer \
   mtpaint \
   mysql \
-  nano \
+  nano navit \
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python python-pygtk python-pyserial \
-#  python-efl \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   settingsgui \
@@ -46,7 +45,6 @@ RDEPENDS_task-openmoko-feed = "\
   classpath \
   gpsdrive \
   asterisk \
-  qtopia-phone \
   gnash \
   mono \
   diversity-daemon \
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 2d57cfee5a..f8d9d3501b 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -8,6 +8,7 @@ HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
 PR = "r18"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 ALLOW_EMPTY = "1"
 
 #----------------------------------------------------------------------------------