merge of '7b528e427242c4fc04839c0b8e3f065248b5c0dc'

     and 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'

5 files changed, 29 insertions, 17 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index def6bec2bc..da1fdf97cd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r50"
+PR = "r54"
 
 inherit task
 
@@ -15,6 +15,7 @@ PACKAGES = ' \
             ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
             ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
@@ -87,6 +88,7 @@ RDEPENDS_task-base = "\
     \
     ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
@@ -188,6 +190,12 @@ RDEPENDS_task-base-ext2 = "\
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs"
 
+RRECOMMENDS_task-base-vfat = "\
+    kernel-module-msdos \
+    kernel-module-vfat \
+    kernel-module-nls-iso8859-1 \
+    kernel-module-nls-cp437"
+
 RDEPENDS_task-base-alsa = "\
     alsa-utils-alsactl \
     alsa-utils-alsamixer"
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 0435c2aa62..5663ff5a3d 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 = "r42"
+PR = "r43"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
index e47a1e5465..49e4e66859 100644
--- a/packages/tasks/task-openmoko-phone.bb
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PROVIDES = "task-openmoko-everything"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index c81691cd34..65dc7661c9 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -9,7 +9,7 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dbus			\
 		python-dialog		\
-		python-directfb		\
+		python-pydirectfb		\
 		python-efl			\
 		python-pycurl		\
 		python-fam			\
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index ecb3189741..4b8fde02c0 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -20,20 +20,23 @@ ALLOW_EMPTY = "1"
 SLUGOS_STANDARD_RDEPENDS = ""
 SLUGOS_STANDARD_RRECOMMENDS = ""
 
-# diff, cpio and find are required for reflash and turnup ram.
-# Removing these probably leaves the system bootable, but standard
-# openslug and ucslugc stuff won't work, so only take these out in
-# very non-standard turnkey slugos builds.
-#
-# udev is the default way of handling devices, there is no guarantee
-# that the static device table is completely correct (it is just
-# known to be sufficient for boot.)
-SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils"
+# diff, cpio and find are required for turnup and ipkg.
+SLUGOS_STANDARD_RRECOMMENDS += "\
+diffutils \
+cpio \
+findutils \
+"
 
 # These lines add support for formatting ext2 and ext3 file systems
 # on a hard disk attached to the NSLU2.  ext3 is the standard Linux
 # file system.
-SLUGOS_STANDARD_RRECOMMENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+SLUGOS_STANDARD_RRECOMMENDS += "\
+e2fsprogs-mke2fs \
+e2fsprogs-fsck \
+e2fsprogs-e2fsck \
+e2fsprogs-badblocks \
+e2fsprogs-blkid \
+"
 
 # These lines add support for an X/Y/ZModem package called lrzsz
 # (this is of use for people with modified NSLU2 hardware which
@@ -66,7 +69,6 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-
 # Add daemon required for HW RNG support
 SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools"
 SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = ""
@@ -93,6 +95,9 @@ kernel-module-ixp4xx-qmgr \
 kernel-module-via-velocity \
 "
 
+# Other candidate packages that have been considered and
+# are intentionally excluded from the base flash image.
+#
 # portmap \
 # kexec-tools \
 # kernel-module-nfs \
@@ -118,7 +123,6 @@ RDEPENDS += "\
 	module-init-tools modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	beep \
-	e2fsprogs-blkid \
 	util-linux-mount \
 	util-linux-umount \
 	util-linux-swaponoff \
@@ -126,6 +130,7 @@ RDEPENDS += "\
 	${SLUGOS_STANDARD_RDEPENDS} \
 	${DISTRO_EXTRA_RDEPENDS}"
 
+DISTRO_EXTRA_RRECOMMENDS ?= ""
 RRECOMMENDS += "\
 	openssh \
 	${SLUGOS_STANDARD_RRECOMMENDS} \