merge of '09957ec14fdf3babf0d22d779c7264d24330e535'

     and 'c03b12513a0d9faea02ff87386f5cb243f7ece3e'

5 files changed, 16 insertions, 15 deletions

diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 3d08f465ba..f1a90abf8e 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r37"
+PR = "r38"
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = 'task-boot'
@@ -31,6 +31,9 @@ DISTRO_LOGIN_MANAGER ?= "tinylogin"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
+# Make sure we build the kernel
+DEPENDS = "virtual/kernel"
+
 #
 # minimal set of packages - needed to boot
 #
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
index b587578120..d4fbaecd37 100644
--- a/packages/tasks/task-gpe-base.bb
+++ b/packages/tasks/task-gpe-base.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Base task package for GPE Palmtop Environment"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 RDEPENDS = "\
-    virtual/libx11 \
     gpe-bootsplash \
     bluez-utils-dbus \
     matchbox \
@@ -32,7 +31,5 @@ RDEPENDS = "\
     gdk-pixbuf-loader-jpeg \
     pango-module-basic-x \
     pango-module-basic-fc \
-    ttf-dejavu-sans \
-    ttf-dejavu-sans-mono \
-    ttf-dejavu-serif"
+    ttf-bitstream-vera"
 
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index 8bf39d8af9..f2a108b712 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
-    gpephone-base-depends \
     gpephone-task-base \
     gpephone-task-settings \
     gpephone-task-pim \
@@ -12,9 +11,6 @@ PACKAGES = "\
     gpephone-task-apps \
     gpephone-task-development"
 
-RDEPENDS_gpephone-base-depends = "\
-    virtual/libx11"
-
 RDEPENDS_gpephone-task-development = "\
     rxvt-unicode \
     gpe-terminal \
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 7ad13c7acc..56e26cdb32 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r54"
+PR = "r56"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -65,11 +65,13 @@ RDEPENDS_task-openmoko-ui = "\
   xset \
   xrandr \
   settings-daemon \
+  \
   openmoko-session2 \
   openmoko-theme-standard2 \
   openmoko-icon-theme-standard2 \
   openmoko-sound-system \
   openmoko-sound-theme-standard \
+  neod \
 "
 
 #
@@ -77,13 +79,13 @@ RDEPENDS_task-openmoko-ui = "\
 #
 DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
 RDEPENDS_task-openmoko-base = "\
-  openmoko-terminal \
   matchbox-panel-2 \
   matchbox-panel-2-applets \
   matchbox-applet-inputmanager \
 #  openmoko-appmanager \
   matchbox-keyboard \
   matchbox-stroke \
+  openmoko-terminal2 \
   openmoko-keyboard \
 #  openmoko-panel-mainmenu \
   openmoko-panel-battery \
@@ -114,8 +116,8 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-calculator2 \
   openmoko-contacts2 \
   openmoko-today2 \
+  openmoko-feedreader2 \
 #  openmoko-messages \
-#  openmoko-rssreader \
 "
 
 #
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index d2281bca17..21f1b551f5 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -92,6 +92,9 @@ kernel-module-pata-artop \
 
 # Add modules required for Network support
 SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-mii \
+kernel-module-ixp4xx-mac \
+kernel-module-ixp4xx-qmgr \
 kernel-module-via-velocity \
 "