merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

32 files changed, 1096 insertions, 553 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index f74d8f8943..84c3610b8f 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,202 +1,237 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r19"
-
-PACKAGES = "task-base \
-            task-base-minimal \
-            task-base-oh-minimal \
-            task-base-core-default"
+PR = "r41"
+
+DEPENDS = "task-boot"
+PROVIDES = "${PACKAGES}"
+PACKAGES = ' \
+            task-base \
+            task-base-extended \
+            task-distro-base \
+            task-machine-base \
+            \
+            task-base-acpi \
+            task-base-alsa \
+            task-base-apm \
+            task-base-bluetooth \
+            task-base-ext2 \
+            task-base-irda \
+            task-base-keyboard \
+            task-base-pci \
+            task-base-pcmcia \
+            task-base-phone \
+            task-base-screen \
+            task-base-serial \
+            task-base-touchscreen \
+            task-base-usbgadget \
+            task-base-usbhost \
+            task-base-wifi \
+            \
+            task-base-cramfs \
+            task-base-ipsec \
+            task-base-ipv6 \
+            task-base-nfs \
+            task-base-ppp \
+            task-base-smbfs \
+	    \
+            ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
+	    '
 
 ALLOW_EMPTY = "1"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "all"
+
+#
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
+PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-bluetooth = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-irda = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-wifi = "${MACHINE_ARCH}"
 
-# Valid only in MACHINE_FEATURES:
 #
-# kernel24
-# kernel26
-# apm
-# keyboard
-# touchscreen
-# screen
-# pci
-# acpi
-# phone
-
-# Valid only in DISTRO_FEATURES:
+# linux-hotplug or none
+#
+HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
+
 #
-# nfs
-# smbfs
-# ipsec
-# wifi
-# ppp
-
-# Valid COMBINED_FEATURES:
-# (These features need to be supported by both the machine and the distro)
+# dropbear, openssh or none
 #
-# alsa
-# bluetooth
-# ext2
-# irda
-# pci
-# pcmcia
-# usbgadget
-# usbhost
+DISTRO_SSH_DAEMON ?= "dropbear"
 
-DISTRO_CORE_PACKAGE ?= "task-base-core-default"
+#
+# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
+#
+PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
+
+#
+# those ones can be set in machine config to supply packages needed to get machine booting
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
 #
-# task-base
+# task-base contain stuff needed for base system (machine related)
 #
 RDEPENDS_task-base = "\
-    ${DISTRO_CORE_PACKAGE} \
-    kernel \
-    ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
-    ${MACHINE_EXTRA_RDEPENDS} \
-    ${DISTRO_EXTRA_RDEPENDS}"
-
-RRECOMMENDS_task-base = "\
-    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
-    ${MACHINE_EXTRA_RRECOMMENDS} \
-    ${DISTRO_EXTRA_RRECOMMENDS}"
+    task-boot \
+    task-distro-base \
+    task-machine-base \
+    ${DISTRO_SSH_DAEMON} \
+    ${HOTPLUG} \
+    \
+    ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
+    ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
+    ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
+    ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
+    \
+    ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',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)} \
+    ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
+    \
+    ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
+    "
+
+RDEPENDS_task-base-extended = "\
+    task-base \
+    ${ADD_WIFI} \
+    ${ADD_BT} \
+    "
+
+ADD_WIFI = ""
+ADD_BT = ""
+
+python __anonymous () {
+    # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
+    # then include task-base-wifi in task-base
+
+    import bb
+
+    if not hasattr(__builtins__, 'set'):
+	from sets import Set as set
+
+    distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split())
+    machine_features= set(bb.data.getVar("MACHINE_FEATURES", d, 1).split())
+
+    if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
+	bb.data.setVar("ADD_BT", "task-base-bluetooth", d)
+
+    if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
+	bb.data.setVar("ADD_WIFI", "task-base-wifi", d)
+}
 
+#
+# packages added by distribution
+#
+RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
+RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
 
 #
-# task-base-oh-minimal
-# An example of a small cut down machine configuration
+# packages added by machine config
 #
-RDEPENDS_task-base-oh-minimal = "\
-    kernel \
-    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-
-RRECOMMENDS_task-base-minimal = "\
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
-
-
-
-HOTPLUG ?= "linux-hotplug"
-
-RDEPENDS_task-base-core-default = '\
-    base-files \
-    base-passwd \
-    busybox \
-    initscripts \
-    netbase \
-    sysvinit \
-    sysvinit-pidof \
-    tinylogin \
-    modutils-initscripts \
-    fuser \
-    setserial'
-# Lets see if we can kill off hotplug...
-#    ${HOTPLUG}
-#    ${@bootstrap_modutils_rdepends(d)}
-
-
-RRECOMMENDS_task-base-core-default = '\
-    dropbear '
-
-task-base-kernel24-rdepends = "\
-    modutils-depmod \
-    linux-hotplug "
-
-task-base-kernel26-rdepends = "\
-    udev \
+RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
+RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
+
+RDEPENDS_task-base-kernel24 = "\
+    modutils-depmod"
+
+RDEPENDS_task-base-kernel26 = "\
     sysfsutils \
     module-init-tools"
 
-task-base-keyboard-rdepends = "\
+RRECOMMENDS_task-base-kernel24 = "\
+    kernel-module-input \
+    kernel-module-uinput"
+
+RRECOMMENDS_task-base-kernel26 = "\
+    kernel-module-input \
+    kernel-module-uinput \
+    kernel-module-rtc-dev \
+    kernel-module-rtc-proc \
+    kernel-module-rtc-sysfs \
+    kernel-module-rtc-sa1100"
+
+RDEPENDS_task-base-keyboard = "\
     keymaps"
 
-task-base-pci-rdepends = "\
+RDEPENDS_task-base-pci = "\
     pciutils"
 
-task-base-kernel26-extras-rrecommends = "\
-    kernel-module-input \
-    kernel-module-uinput"
-
-task-base-acpi-rdepends = "\
+RDEPENDS_task-base-acpi = "\
     acpid"
 
-task-base-apm-rdepends = "\
+RDEPENDS_task-base-apm = "\
     apm \
     apmd \
-    ${@base_contains("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}"
+    ${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}"
 
-task-base-ext2-rdepends = "\
+RDEPENDS_task-base-ext2 = "\
     hdparm \
     e2fsprogs \
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs"
 
-task-base-alsa-rdepends = "\
+RDEPENDS_task-base-alsa = "\
     alsa-utils-alsactl \
     alsa-utils-alsamixer"
 
-task-base-alsa-rrecommends = "\
+#
+# alsa-states are machine related so can be missing in feed, OSS support is optional
+#
+RRECOMMENDS_task-base-alsa = "\
+    alsa-state \
+    alsa-states \
     kernel-module-snd-mixer-oss \
     kernel-module-snd-pcm-oss"
 
-task-base-pcmcia-rdepends = "\
+RDEPENDS_task-base-pcmcia = "\
     ${PCMCIA_MANAGER} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}"
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \
+    "
 
-task-base-pcmcia-rrecommends = "\
+RRECOMMENDS_task-base-pcmcia = "\
+    ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
     kernel-module-pcmcia \
     kernel-module-airo-cs \
     kernel-module-pcnet-cs \
     kernel-module-serial-cs \
     kernel-module-ide-cs \
-    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
+    kernel-module-ide-disk \
+    "
+
+task-base-pcmcia24 = "\
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
+    "
 
-task-base-pcmcia24-rrecommends = "\
-    ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}"
+task-base-pcmcia26 = "\
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
-task-base-pcmcia26-rrecommends = "\
-    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}"
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
 
-task-base-bluetooth-rdepends = "\ 
-	blueprobe \
-	bluez-utils"
+RDEPENDS_task-base-bluetooth = "\ 
+    blueprobe \
+    bluez-utils \
+    bluez-utils-compat \  
+    "
 
-task-base-bluetooth-rrecommends = "\
+RRECOMMENDS_task-base-bluetooth = "\
     kernel-module-bluetooth \
     kernel-module-l2cap \
     kernel-module-rfcomm \
@@ -205,37 +240,44 @@ task-base-bluetooth-rrecommends = "\
     kernel-module-hidp \
     kernel-module-hci-uart \
     kernel-module-sco \
-    ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)}"
-
-task-base-irda-rdepends = "\
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
+    "
+# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
+# kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer.
+
+RDEPENDS_task-base-irda = "\
     irda-utils"
 
-task-base-irda-rrecommends = "\
+RRECOMMENDS_task-base-irda = "\
     kernel-module-pxaficp-ir \
     kernel-module-irda \
     kernel-module-ircomm \
     kernel-module-ircomm-tty \
     kernel-module-irlan \
-    ${@base_contains("DISTRO_FEATURES", "ppp", "kernel-module-irnet", "",d)} \
+    ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \
     kernel-module-irport \
     kernel-module-irtty \
-    ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} "
+    kernel-module-irtty-sir \
+    kernel-module-sir-dev \
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
 
-task-base-usbgadget-rrecommends = "\
+RRECOMMENDS_task-base-usbgadget = "\
     kernel-module-pxa27x_udc \
     kernel-module-gadgetfs \
     kernel-module-g-file-storage \
     kernel-module-g-serial \
-    kernel-module-g-ether"
+    kernel-module-g-ether \
+    usb-gadget-mode"
 
-task-base-usbhost-rdepends = "\
+RDEPENDS_task-base-usbhost = "\
     usbutils "
 
-task-base-usbhost-rrecommends = "\
+RRECOMMENDS_task-base-usbhost = "\
     kernel-module-uhci-hcd \
     kernel-module-ohci-hcd \
     kernel-module-ehci-hcd \
@@ -249,58 +291,93 @@ task-base-usbhost-rrecommends = "\
     kernel-module-usbserial \
     kernel-module-usb-storage "
 
-task-distro-ppp-rdepends = "\
+RDEPENDS_task-base-uboot = "\
+    uboot-utils"
+
+RDEPENDS_task-base-redboot = "\
+    fis"
+
+RDEPENDS_task-base-ppp = "\
     ppp \
     ppp-dialin"
 
-task-distro-ppp-rrecommends = "\
+RRECOMMENDS_task-base-ppp = "\
     kernel-module-ppp-async \
     kernel-module-ppp-deflate \
     kernel-module-ppp-mppe"
 
-task-distro-ipsec-rdepends = "\
+RDEPENDS_task-base-ipsec = "\
     openswan"
 
-task-distro-ipsec-rrecommends = "\
+RRECOMMENDS_task-base-ipsec = "\
     kernel-module-ipsec"
 
-task-distro-wifi-rdepends = "\
+#
+# task-base-wifi contain everything needed to get WiFi working
+# WEP/WPA connection needs to be supported out-of-box
+#
+RDEPENDS_task-base-wifi = "\
     wireless-tools \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-tools', '',d)} \
     wpa-supplicant"
 
-task-distro-wifi-rrecommends = "\
+RRECOMMENDS_task-base-wifi = "\
+    ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-modules', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
     kernel-module-ieee80211-crypt \
     kernel-module-ieee80211-crypt-ccmp \
     kernel-module-ieee80211-crypt-tkip \
     kernel-module-ieee80211-crypt-wep \
+    kernel-module-ecb \
     kernel-module-arc4 \
     kernel-module-michael-mic \
     kernel-module-aes"
 
-task-distro-smbfs-rrecommends = "\
+RRECOMMENDS_task-base-smbfs = "\
     kernel-module-cifs \
     kernel-module-smbfs"
 
-task-distro-cramfs-rrecommends = "\
+RRECOMMENDS_task-base-cramfs = "\
     kernel-module-cramfs"
 
-task-distro-nfs-rdepends = "\
+#
+# task-base-nfs provides ONLY client support - server is in nfs-utils package
+#
+RDEPENDS_task-base-nfs = "\
     portmap"
 
-task-distro-nfs-rrecommends = "\
-    kernel-module-nfs \
-    kernel-module-lockd \
-    kernel-module-sunrpc"
+RRECOMMENDS_task-base-nfs = "\
+    kernel-module-nfs "
+
+RDEPENDS_task-base-raid = "\
+	"
+
+RDEPENDS_task-base-screen = "\
+	"
+
+#
+# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
+#
+RDEPENDS_task-base-touchscreen = "\
+    tslib-tests \
+    tslib-calibrate "
+
+RDEPENDS_task-base-ipv6 = "\
+    "
 
+RRECOMMENDS_task-base-ipv6 = "\
+    kernel-module-ipv6 "
+
+RDEPENDS_task-base-serial = "\
+    setserial \
+    lrzsz "
 
 # Tosort
-# kernel-module-ipv6
 # kernel-module-nvrd
 # kernel-module-mip6-mn
 # kernel-module-tun
-# kernel-module-ide-disk
 # kernel-module-ide-probe-mo
 # kernel-module-loop
 # kernel-module-vfat
@@ -314,4 +391,3 @@ task-distro-nfs-rrecommends = "\
 # kernel-module-md5
 # kernel-module-8250
 # Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz
-
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
new file mode 100644
index 0000000000..3d08f465ba
--- /dev/null
+++ b/packages/tasks/task-boot.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Basic task to get a device booting"
+PR = "r37"
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = 'task-boot'
+
+ALLOW_EMPTY = "1"
+
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#
+# udev, devfsd, mdev (from busybox) or none
+#
+DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26",  "udev","",d)} "
+
+#
+# sysvinit, upstart
+#
+DISTRO_INIT_MANAGER ?= "sysvinit sysvinit-pidof"
+
+#
+# tinylogin, getty
+#
+DISTRO_LOGIN_MANAGER ?= "tinylogin"
+
+#
+# those ones can be set in machine config to supply packages needed to get machine booting
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+#
+# minimal set of packages - needed to boot
+#
+RDEPENDS_task-boot = "\
+    kernel \
+    base-files \
+    base-passwd \
+    busybox \
+    initscripts \
+    modutils-initscripts \
+    netbase \
+    update-alternatives \
+    ${DISTRO_DEV_MANAGER} \
+    ${DISTRO_INIT_MANAGER} \
+    ${DISTRO_LOGIN_MANAGER} \
+    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
+    "
+
+RRECOMMENDS_task-boot = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
+    "
diff --git a/packages/tasks/task-gmae.bb b/packages/tasks/task-gmae.bb
new file mode 100644
index 0000000000..ac794102f2
--- /dev/null
+++ b/packages/tasks/task-gmae.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "GNOME Mobile & Embedded Initiative"
+PR = "r0"
+
+PACKAGES = 'gmae-core \
+            gmae-toolkit \
+            gmae-user \
+	    task-gmae \
+	    '
+
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "all"
+
+
+RDEPENDS_gmae-core = " \
+            ${XSERVER} \
+	    glib-2.0 \
+	    gtk+ \
+            "
+
+RDEPENDS_gmae-toolkit = " \
+            pango \
+	    cairo \
+	    atk \
+            "
+
+RDEPENDS_gmae-user = " \
+            bluez-utils \
+	    eds-dbus \
+	    telepathy-gabble libtelepathy \
+	    avahi-utils \
+	    gstreamer \
+	    matchbox-wm matchbox-panel \
+	    gconf-dbus \
+	    gnome-vfs \
+	    "
+
+RDEPENDS_task-gmae = " \
+            gmae-core \
+            gmae-toolkit \
+            gmae-user \
+	    "
+
diff --git a/packages/tasks/task-gpe-apps.bb b/packages/tasks/task-gpe-apps.bb
new file mode 100644
index 0000000000..5aee575b75
--- /dev/null
+++ b/packages/tasks/task-gpe-apps.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Application task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-clock \
+    gpe-plucker \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    gpe-aerial \
+    rosetta \
+    gpe-scap \
+    gpe-windowlist \
+    gpe-filemanager \
+    gpe-soundbite \
+    mbmerlin \
+    starling"
+
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
new file mode 100644
index 0000000000..d4fbaecd37
--- /dev/null
+++ b/packages/tasks/task-gpe-base.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Base task package for GPE Palmtop Environment"
+PR = "r7"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-bootsplash \
+    bluez-utils-dbus \
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gtk2-theme-angelistic \
+    matchbox-themes-gtk \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    startup-monitor \
+    libgtkstylus \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc \
+    ttf-bitstream-vera"
+
diff --git a/packages/tasks/task-gpe-connectivity.bb b/packages/tasks/task-gpe-connectivity.bb
new file mode 100644
index 0000000000..678afb8c1a
--- /dev/null
+++ b/packages/tasks/task-gpe-connectivity.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-mini-browser \
+    gpe-irc"
+
diff --git a/packages/tasks/task-gpe-desktopapps.bb b/packages/tasks/task-gpe-desktopapps.bb
new file mode 100644
index 0000000000..346cd70353
--- /dev/null
+++ b/packages/tasks/task-gpe-desktopapps.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    sylpheed \
+    firefox \
+    thunderbird \
+    galculator \
+    gnumeric \
+    gpdf"
+
diff --git a/packages/tasks/task-gpe-games.bb b/packages/tasks/task-gpe-games.bb
new file mode 100644
index 0000000000..6076f5ba70
--- /dev/null
+++ b/packages/tasks/task-gpe-games.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Games task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris \
+    gsoko \
+    xdemineur"
+
diff --git a/packages/tasks/task-gpe-pim.bb b/packages/tasks/task-gpe-pim.bb
new file mode 100644
index 0000000000..a81b5a9a34
--- /dev/null
+++ b/packages/tasks/task-gpe-pim.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS_gpe-task-pim = "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-sketchbook \
+    gpe-contacts \
+    gpe-synctool \
+    gpesyncd \
+    miniclipboard"
+
+# broken    gpe-today \ 
+
+
diff --git a/packages/tasks/task-gpe-sectest.bb b/packages/tasks/task-gpe-sectest.bb
new file mode 100644
index 0000000000..75b525b618
--- /dev/null
+++ b/packages/tasks/task-gpe-sectest.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Security testing task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    nmap \
+    ettercap \
+    stunnel \
+    curl \
+    dsniff \
+    prismstumbler \
+    tcpdump \
+    kismet \
+    hydra \
+    thcrut"
+
diff --git a/packages/tasks/task-gpe-settings.bb b/packages/tasks/task-gpe-settings.bb
new file mode 100644
index 0000000000..ddfcb282f1
--- /dev/null
+++ b/packages/tasks/task-gpe-settings.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Settings task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    gpe-mininet \
+    gpe-bluetooth \
+    gpe-beam \
+    matchbox-panel-manager \
+    gpe-su \
+    gpe-conf \
+    gpe-clock \
+    gpe-mixer \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    minimix \
+    xmonobut"
+
diff --git a/packages/tasks/task-gpe-web.bb b/packages/tasks/task-gpe-web.bb
new file mode 100644
index 0000000000..247165ba9d
--- /dev/null
+++ b/packages/tasks/task-gpe-web.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+
+RDEPENDS = "\
+    pidgin \
+    minimo"
+
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index b59b3ceea3..5399c12025 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -16,11 +16,11 @@ PACKAGES = "\
     gpe-task-desktopapps \
     gpe-task-sectest"
 
-RDEPENDS_gpe-base-depends := "\
+RDEPENDS_gpe-base-depends = "\
     diet-x11 \
     virtual/xserver"
 
-RDEPENDS_gpe-task-base := "\
+RDEPENDS_gpe-task-base = "\
     gpe-bootsplash \
     bluez-utils-dbus \
     matchbox \
@@ -49,7 +49,7 @@ RDEPENDS_gpe-task-base := "\
     pango-module-basic-x \
     pango-module-basic-fc"
 
-RDEPENDS_gpe-task-pim := "\
+RDEPENDS_gpe-task-pim = "\
     gpe-timesheet \
     gpe-todo \
     gpe-calendar \
@@ -58,7 +58,7 @@ RDEPENDS_gpe-task-pim := "\
     gpe-today \
     gpesyncd"
 
-RDEPENDS_gpe-task-settings := "\
+RDEPENDS_gpe-task-settings = "\
     matchbox-panel-manager \
     gpe-bluetooth \
     gpe-beam \
@@ -75,7 +75,7 @@ RDEPENDS_gpe-task-settings := "\
     minimix \
     xmonobut"
 
-RDEPENDS_gpe-task-apps := "\
+RDEPENDS_gpe-task-apps = "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
@@ -91,7 +91,7 @@ RDEPENDS_gpe-task-apps := "\
     gpe-scap \
     gpe-windowlist"
 
-RDEPENDS_gpe-task-games := "\
+RDEPENDS_gpe-task-games = "\
     gpe-go \
     gpe-lights \
     gpe-othello \
@@ -99,40 +99,39 @@ RDEPENDS_gpe-task-games := "\
     gsoko \
     xdemineur"
 
-RDEPENDS_gpe-task-connectivity := "\
+RDEPENDS_gpe-task-connectivity = "\
     gpe-mini-browser"
 #    gaim
 #    linphone-hh
 
-RDEPENDS_gpe-task-apps-extra := "\
+RDEPENDS_gpe-task-apps-extra = "\
     gpe-filemanager \
     gpe-soundbite \
     mbmerlin"
 
-RDEPENDS_gpe-task-web := "\
+RDEPENDS_gpe-task-web = "\
     gpe-irc \
     minimo \
-    gaim"
+    pidgin"
 
-RDEPENDS_gpe-task-desktopapps := "\
+RDEPENDS_gpe-task-desktopapps = "\
     firefox \
     thunderbird \
     galculator \
     gnumeric \
-    gpdf \
-    totem"
+    gpdf"
+#    totem"
 
-RDEPENDS_gpe-task-sectest := "\
+RDEPENDS_gpe-task-sectest = "\
     mbmerlin \
     nmap \
     ettercap \
     stunnel \
     curl \
-    dsniff \
+#    dsniff \
     prismstumbler \
     tcpdump \
     kismet \
     hydra \
     thcrut \
     miniclipboard"
-#	driftnet \
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index 87f8c01749..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 = "r2"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
-    gpephone-base-depends \
     gpephone-task-base \
     gpephone-task-settings \
     gpephone-task-pim \
@@ -12,20 +11,17 @@ PACKAGES = "\
     gpephone-task-apps \
     gpephone-task-development"
 
-RDEPENDS_gpephone-base-depends := "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_gpephone-task-development := "\
+RDEPENDS_gpephone-task-development = "\
     rxvt-unicode \
-    xmonobut \
     gpe-terminal \
     gpe-edit \
     gdb \
     strace \
-    e2fsprogs"
+    e2fsprogs \
+    bluez-utils-compat \
+    minicom"
 
-RDEPENDS_gpephone-task-base := "\
+RDEPENDS_gpephone-task-base = "\
     cms92init \
     gsmmux \
     connect \
@@ -67,28 +63,27 @@ RDEPENDS_gpephone-task-base := "\
     pango-module-basic-x \
     pango-module-basic-fc \
     detect-stylus \
+    ptim-manager \
+    ptim-helper \
+    ptim-engine \
     ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
 "
 
-RDEPENDS_gpephone-task-pim := "\
+RDEPENDS_gpephone-task-pim = "\
      gpesyncd"
 
-RDEPENDS_gpephone-task-settings := "\
+RDEPENDS_gpephone-task-settings = "\
     gpe-su \
     gpe-conf \
-    gpe-clock \
     gpe-mixer \
     gpe-taskmanager \
-    keylaunch \
-    minilite"
+    minilite \
+    machined"
 
-RDEPENDS_gpephone-task-apps := "\
-    gpe-watch \
+RDEPENDS_gpephone-task-apps = "\
     gpe-what \
-    matchbox-panel-hacks \
     gpe-scap \
     gpe-windowlist"
 
-RDEPENDS_gpephone-task-connectivity := "\
+RDEPENDS_gpephone-task-connectivity = "\
 "
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
new file mode 100644
index 0000000000..fe8672381a
--- /dev/null
+++ b/packages/tasks/task-mokogateway.bb
@@ -0,0 +1,82 @@
+DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+PROVIDES = "task-mokogateway-everything"
+PR = "r3"
+
+PACKAGES = "\
+	task-mokogateway-everything \
+	${MOKOGATEWAY_PACKAGES} \
+"
+
+MOKOGATEWAY_PACKAGES = "\
+	task-mokogateway-usbnet \
+	task-mokogateway-bluetooth \
+	task-mokogateway-wifi \
+	task-mokogateway-debug \
+"
+
+RDEPENDS_task-mokogateway-everything = "${MOKOGATEWAY_PACKAGES}"
+
+DESCRIPTION_task-mokogateway-usbnet = "MokoGateway: USB Networking"
+RDEPENDS_task-mokogateway-usbnet = "\
+	iptables \
+"
+RRECOMMENDS_task-mokogateway-usbnet = "\
+	kernel-module-usbnet \
+	kernel-module-cdc-acm \
+	kernel-module-cdc-ether \
+	kernel-module-iptable-nat \
+	kernel-module-ipt-masquerade \
+"
+
+DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth"
+RDEPENDS_task-mokogateway-bluetooth = "\
+	bluez-utils \
+"
+RRECOMMENDS_task-mokogateway-bluetooth = "\
+	kernel-module-bluetooth \
+	kernel-module-l2cap \
+	kernel-module-rfcomm \
+	kernel-module-hci-vhci \
+	kernel-module-bnep \
+	kernel-module-hidp \
+	kernel-module-hci-uart \
+	kernel-module-sco \
+	${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-bluetooth3c-cs", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-bluecard-cs", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-bluetoothuart-cs", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-dtl1-cs", "",d)} \
+"
+
+DESCRIPTION_task-mokogateway-wifi = "MokoGateway: WiFi"
+RDEPENDS_task-mokogateway-wifi = "\
+	bridge-utils \
+	wireless-tools \
+	${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-modules", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-tools", "",d)} \
+	wpa-supplicant \
+"
+RRECOMMENDS_task-mokogateway-wifi = "\
+	kernel-module-ieee80211-crypt \
+	kernel-module-ieee80211-crypt-ccmp \
+	kernel-module-ieee80211-crypt-tkip \
+	kernel-module-ieee80211-crypt-wep \
+	kernel-module-arc4 \
+	kernel-module-michael-mic \
+	kernel-module-aes \
+	${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-zd1211rw", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "usbhost", "zd1211-firmware", "",d)} \
+"
+
+DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug"
+RDEPENDS_task-mokogateway-debug = "\
+	dfu-util \
+	ftdi-eeprom \
+	openocd \
+"
+RRECOMMENDS_task-mokogateway-debug = "\
+"
+
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 1d748f1235..56e26cdb32 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -1,22 +1,21 @@
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
+PR = "r56"
 
-PR = "r28"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
 
 PACKAGES = "\
   task-openmoko-linux \
   task-openmoko-ui \
   task-openmoko-base \
   task-openmoko-phone \
-  task-openmoko-finger \
   task-openmoko-pim \
   task-openmoko-net \
   \
-  task-openmoko-demo \
+  task-openmoko-games \
   task-openmoko-examples \
   task-openmoko-debug \
   task-openmoko-native-sdk \
@@ -30,43 +29,17 @@ RDEPENDS_task-openmoko-everything := "${PACKAGES}"
 DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
 RDEPENDS_task-openmoko-linux = "\
   task-base \
-  base-files \
-  base-passwd \
-  busybox \
-  dropbear \
-  fuser \
-  initscripts \
   netbase \
   sysfsutils \
-  setserial \
-  sysvinit \
-  sysvinit-pidof \
-  tinylogin \
   modutils-initscripts \
   module-init-tools-depmod \
-  udev \
   rsync \
+  screen \
+  psplash \
 #  update-alternatives \
 "
 
 #
-# task-openmoko-base
-#
-DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, and Panel"
-RDEPENDS_task-openmoko-base = "\
-"
-
-#
-# task-openmoko-phone
-#
-DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM Phone Services"
-RDEPENDS_task-openmoko-phone = "\
-  gsmd \
-  libgsmd-tools \
-  openmoko-dialer \
-"
-
-#
 # task-openmoko-ui
 #
 DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
@@ -78,21 +51,27 @@ RDEPENDS_task-openmoko-ui = "\
   pango-module-basic-x \
   pango-module-basic-fc \
   gtk+ \
+  libgtkstylus \
+  libgtkinput \
   matchbox-common \
   matchbox-wm \
-  matchbox-panel-2 \
   xserver-kdrive-fbdev \
   xserver-kdrive-common \
   xserver-nodm-init \
+#  x11-c-locale \
   ttf-bitstream-vera \
   xauth \
   xhost \
   xset \
   xrandr \
-  openmoko-common \
-  openmoko-session \
-  openmoko-theme-standard \
-#  psplash \
+  settings-daemon \
+  \
+  openmoko-session2 \
+  openmoko-theme-standard2 \
+  openmoko-icon-theme-standard2 \
+  openmoko-sound-system \
+  openmoko-sound-theme-standard \
+  neod \
 "
 
 #
@@ -100,11 +79,20 @@ RDEPENDS_task-openmoko-ui = "\
 #
 DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
 RDEPENDS_task-openmoko-base = "\
-  openmoko-mainmenu \
   matchbox-panel-2 \
-  openmoko-footer \
-  openmoko-taskmanager \
-  openmoko-panel-mainmenu \
+  matchbox-panel-2-applets \
+  matchbox-applet-inputmanager \
+#  openmoko-appmanager \
+  matchbox-keyboard \
+  matchbox-stroke \
+  openmoko-terminal2 \
+  openmoko-keyboard \
+#  openmoko-panel-mainmenu \
+  openmoko-panel-battery \
+  openmoko-panel-bt \
+  openmoko-panel-clock \
+  openmoko-panel-usb \
+  openmoko-panel-gps \
 "
 
 #
@@ -114,16 +102,9 @@ DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
 RDEPENDS_task-openmoko-phone = "\
   gsmd \
   libgsmd-tools \
-  openmoko-dialer \
+  openmoko-dialer2 \
   openmoko-panel-gsm \
-# ppp \
-"
-
-#
-# task-openmoko-finger
-#
-DESCRIPTION_task-openmoko-finger = "OpenMoko: Finger UI Applications"
-RDEPENDS_task-openmoko-finger = "\
+#  ppp \
 "
 
 #
@@ -132,8 +113,11 @@ RDEPENDS_task-openmoko-finger = "\
 DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
 RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
-  openmoko-contacts \
-  openmoko-dates \
+  openmoko-calculator2 \
+  openmoko-contacts2 \
+  openmoko-today2 \
+  openmoko-feedreader2 \
+#  openmoko-messages \
 "
 
 #
@@ -142,43 +126,18 @@ RDEPENDS_task-openmoko-pim = "\
 DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
 RDEPENDS_task-openmoko-net = "\
   bluez-utils \
+  bridge-utils \
 "
 
 #
-# task-openmoko-demo
+# task-openmoko-games
 #
-DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications"
-RDEPENDS_task-openmoko-demo = "\
-  matchbox-desktop \
-  matchbox-keyboard \
-  matchbox-stroke \
-  matchbox-config-gtk \
-  matchbox-panel-manager \
-  matchbox-panel-hacks \
-  matchbox-themes-extra \
-  matchbox-themes-gtk \
-  matchbox-applet-inputmanager \
-  matchbox-applet-startup-monitor \
-  xcursor-transparent-theme \
-  settings-daemon \
-  web \
-  rxvt-unicode \
-  mtpaint \
+DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
+RDEPENDS_task-openmoko-games = "\
+  oh-puzzles \
 "
 
 #
-# task-openmoko-examples
-#
-DESCRIPTION_task-openmoko-examples = "OpenMoko: Example Applications"
-RDEPENDS_task-openmoko-examples = "\
-  openmoko-stylus-demo-simple \
-  openmoko-stylus-demo \
-  openmoko-finger-demo \
-  openmoko-panel-demo-simple \
-  openmoko-panel-demo \
-  openmoko-chordmaster"
-
-#
 # task-openmoko-debug
 #
 DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
@@ -191,12 +150,13 @@ RDEPENDS_task-openmoko-debug = "\
   madplay \
   vorbis-tools \
   strace \
-#  ltrace \
+  ltrace \
   gdb \
   gdbserver \
   tcpdump \
   tslib-calibrate \
   tslib-tests \
+  fbgrab \
   fstests \
   lsof \
   lrzsz \
@@ -204,12 +164,15 @@ RDEPENDS_task-openmoko-debug = "\
   usbutils \
   uucp \
   cu \
-  sensors-i2cdetect sensors-i2cdump sensors-i2cset \
+#  sensors-i2cdetect sensors-i2cdump sensors-i2cset \
   xev \
+  bonnie++ \
+  memtester \
+  dbench \
 "
 
 #
-# task-openmoko-sdk-native
+# task-openmoko-native-sdk
 #
 DESCRIPTION_task-openmoko-native-sdk = "OpenMoko: Native SDK"
 RDEPENDS_task-openmoko-native-sdk = "\
@@ -219,9 +182,9 @@ RDEPENDS_task-openmoko-native-sdk = "\
   gcc-symlinks \
   cpp \
   cpp-symlinks \
+  cvs \
   libc6-dev \
   libgcc-dev \
-  libgcc-s-dev \
   glibc-utils \
   ldd \
   g++ \
diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb
new file mode 100644
index 0000000000..610e06ffb0
--- /dev/null
+++ b/packages/tasks/task-opie-16mb.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Tasks for small OPIE image"
+SECTION = "opie/base"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+ALLOW_EMPTY = "1"
+LICENSE = "MIT"
+
+PR = "r0"
+
+PACKAGES = "task-opie-16mb-base \
+            task-opie-16mb-applets \
+            task-opie-16mb-inputmethods \
+            task-opie-16mb-settings \
+            task-opie-16mb-apps \
+            task-opie-16mb-pim \
+           "
+
+#
+# Dependencies to get the launcher up and running
+#
+RDEPENDS_task-opie-16mb-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
+                           opie-taskbar opie-pics opie-sounds opie-freetype \
+                           ttf-dejavu-sans ttf-dejavu-sans-mono"
+
+#
+# things for reasonable bootstrap image
+#
+RDEPENDS_task-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
+                                   opie-homeapplet opie-rotateapplet \
+		                   opie-brightnessapplet opie-volumeapplet \
+                                   opie-screenshotapplet \
+    ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
+
+#
+# clamshell models can benefit from the autorotate applet
+#
+RDEPENDS_task-opie-16mb-applets_append_c7x0   = " opie-autorotateapplet"
+RDEPENDS_task-opie-16mb-applets_append_spitz  = " opie-autorotateapplet"
+RDEPENDS_task-opie-16mb-applets_append_akita  = " opie-autorotateapplet"
+
+RDEPENDS_task-opie-16mb-inputmethods = "opie-multikey"
+
+RDEPENDS_task-opie-16mb-settings = "opie-packagemanager opie-light-and-power opie-appearance \
+                           opie-systemtime opie-networksettings opie-button-settings \
+                           opie-icon-reload opie-launcher-settings opie-security \
+                           opie-securityplugin-pin"
+
+RDEPENDS_task-opie-16mb-apps = "opie-console opie-clock opie-backup opie-sysinfo \
+                       opie-advancedfm"
+
+RDEPENDS_task-opie-16mb-pim = "opie-addressbook opie-datebook opie-drawpad \
+                      opie-search opie-textedit opie-today opie-todo"
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
new file mode 100644
index 0000000000..8e8d3aa9dc
--- /dev/null
+++ b/packages/tasks/task-opie-all.bb
@@ -0,0 +1,68 @@
+DESCRIPTION = "Tasks for OPIE stuff"

+SECTION = "opie/base"

+ALLOW_EMPTY = "1"

+LICENSE = "MIT"

+PR = "r1"

+

+PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \

+            task-opie-decorations task-opie-multimedia task-opie-wlan \

+            task-opie-settings task-opie-pim task-opie-datebookplugins \

+            task-opie-todayplugins"

+

+#

+# all OPIE stuff

+#

+RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \

+                     opie-bluetoothapplet opie-brightnessapplet opie-cardmon \

+                     opie-clipboardapplet opie-clockapplet opie-homeapplet \

+                     opie-irdaapplet opie-lockapplet opie-logoutapplet \

+                     opie-mailapplet opie-memoryapplet opie-multikeyapplet \

+                     opie-networkapplet opie-notesapplet opie-pcmciaapplet \

+                     opie-pyquicklaunchapplet opie-restartapplet \

+                     opie-restartapplet2 opie-rotateapplet \

+                     opie-screenshotapplet opie-suspendapplet opie-vmemo \

+                     opie-volumeapplet opie-vtapplet opie-zkbapplet \

+                     "

+RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \

+                          opie-handwriting-classicset opie-jumpx opie-keyboard \

+                          opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"

+

+RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid opie-style-metal \

+                    opie-style-web opie-style-phase opie-theme"

+

+RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"

+

+RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \

+                        opie-mediaplayer1-libmadplugin \

+                        opie-mediaplayer1-libmodplugin \

+                        opie-mediaplayer1-libtremorplugin \

+                        opie-mediaplayer1-libwavplugin \

+                        opie-mediaplayer2 \

+                        opie-mediaplayer2-skin-default \

+                        opie-mediaplayer2-skin-default-landscape \

+                        opie-mediaplayer2-skin-pod \

+                        opie-mediaplayer2-skin-techno \

+                        opie-powerchord opie-recorder opie-tonleiter"

+

+RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-button-settings \

+                      opie-citytime opie-confeditor opie-doctab \

+                      opie-formatter opie-language opie-launcher-settings \

+                      opie-light-and-power opie-mediummount opie-networksettings \

+                      opie-packagemanager opie-security opie-sshkeys opie-sysinfo \

+                      opie-systemtime opie-usermanager opie-icon-reload \

+                      opie-vmemo-settings"

+

+RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \

+                 opie-mail opie-pimconverter"

+

+RDEPENDS_task-opie-datebookplugins = "opie-datebook-birthdayplugin \

+                            opie-datebook-chrisholidayplugin \

+                            opie-datebook-nationalholidayplugin"

+

+RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \

+                          opie-today-fortuneplugin opie-today-mailplugin \

+                          opie-today-stocktickerplugin opie-today-todolistplugin \

+                          opie-today-weatherplugin"

+

+RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"

+

diff --git a/packages/tasks/task-opie-apps.bb b/packages/tasks/task-opie-apps.bb
new file mode 100644
index 0000000000..1c03dcc9d9
--- /dev/null
+++ b/packages/tasks/task-opie-apps.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Tasks for OPIE stuff"
+SECTION = "opie/base"
+ALLOW_EMPTY = "1"
+LICENSE = "MIT"
+
+PACKAGES = "task-opie-apps task-opie-extra-apps"
+
+RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
+                  opie-checkbook opie-clock \
+                  opie-console opie-dagger opie-embeddedkonsole \
+                  opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
+                  opie-helpbrowser opie-irc opie-keypebble opie-odict \
+                  opie-oxygen opie-rdesktop opie-reader opie-remote \
+                  opie-sheet opie-tableviewer opie-tinykate \
+                  opie-wellenreiter opie-write opie-zsafe"
+
+#
+# additional things for a >= 24mb distribution
+#
+
+RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
+                        opie-rdesktop opie-wellenreiter opie-irc \
+                        opie-mediaplayer2 \
+                        qpdf2"
+# konqueror-embedded
diff --git a/packages/tasks/task-opie-games.bb b/packages/tasks/task-opie-games.bb
new file mode 100644
index 0000000000..70d2f39b29
--- /dev/null
+++ b/packages/tasks/task-opie-games.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Tasks for OPIE stuff"

+SECTION = "opie/base"

+ALLOW_EMPTY = "1"

+LICENSE = "MIT"

+

+PACKAGES = "task-opie-games task-opie-extra-games"

+

+RDEPENDS_task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \

+                   opie-go opie-kbill opie-kcheckers opie-kpacman opie-mindbreaker \

+                   opie-minesweep opie-oyatzee opie-parashoot opie-qasteroids \

+                   opie-sfcave opie-snake opie-solitaire opie-tetrix opie-tictac \

+                   opie-wordgame opie-zlines opie-zsame"

+

+#

+# additional things for a >= 24mb distribution

+#

+

+RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \

+                         opie-tetrix"

+

diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 616968ea36..018ed9a9c8 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -5,20 +5,18 @@ ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r5"
+PR = "r11"
 
-PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
+PACKAGES = "task-opie-base \
             task-opie-base-applets task-opie-base-apps \
             task-opie-base-decorations task-opie-base-inputmethods \
             task-opie-base-pim task-opie-base-settings \
             task-opie-base-styles task-opie-bluetooth \
             task-opie-base-todayplugins \
-            task-opie-datebookplugins task-opie-decorations \
-            task-opie-extra-apps task-opie-extra-settings \
-            task-opie-extra-styles task-opie-extra-games \
-            task-opie-games task-opie-inputmethods task-opie-irda \
-            task-opie-multimedia task-opie-pim task-opie-settings \
-            task-opie-styles task-opie-todayplugins task-opie-wlan"
+            task-opie-extra-settings \
+            task-opie-extra-styles \
+            task-opie-irda \
+           "
 
 RDEPENDS_task-opie-everything := "${PACKAGES}"
 
@@ -27,16 +25,19 @@ PACKAGES += "task-opie-everything"
 #
 # Dependencies to get the launcher up and running
 #
-RDEPENDS_task-opie-base = "opie-alarm opie-qcop opie-quicklauncher opie-taskbar \
-                           opie-pics opie-sounds opie-freetype ttf-dejavu-sans \
-			   ttf-dejavu-sans-mono"
+RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
+                           opie-taskbar opie-pics opie-sounds opie-freetype \
+                           ttf-dejavu-sans ttf-dejavu-sans-mono"
+# Recommend both landscape and portrait backgrounds
+RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
+                              opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}"
 
 #
 # things for reasonable bootstrap image
 #
 RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
                                    opie-homeapplet opie-rotateapplet \
-		   opie-brightnessapplet opie-volumeapplet \
+		                   opie-brightnessapplet opie-volumeapplet \
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
@@ -85,93 +86,7 @@ RDEPENDS_task-opie-base-pim = "opie-addressbook opie-datebook opie-drawpad \
                       task-opie-base-todayplugins \
                       opie-datebook-birthdayplugin"
 
-#
-# all OPIE stuff
-#
-RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \
-                     opie-bluetoothapplet opie-brightnessapplet opie-cardmon \
-                     opie-clipboardapplet opie-clockapplet opie-homeapplet \
-                     opie-irdaapplet opie-lockapplet opie-logoutapplet \
-                     opie-mailapplet opie-memoryapplet opie-multikeyapplet \
-                     opie-networkapplet opie-notesapplet opie-pcmciaapplet \
-                     opie-pyquicklaunchapplet opie-restartapplet \
-                     opie-restartapplet2 opie-rotateapplet \
-                     opie-screenshotapplet opie-suspendapplet opie-vmemo \
-                     opie-volumeapplet opie-vtapplet opie-zkbapplet \
-                     "
-RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
-                  opie-checkbook opie-clock \
-                  opie-console opie-dagger opie-embeddedkonsole \
-                  opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
-                  opie-helpbrowser opie-irc opie-keypebble opie-odict \
-                  opie-oxygen opie-rdesktop opie-reader opie-remote \
-                  opie-sheet opie-tableviewer opie-tinykate \
-                  opie-wellenreiter opie-write opie-zsafe"
-
-RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
-
-RDEPENDS_task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \
-                   opie-go opie-kbill opie-kcheckers opie-kpacman opie-mindbreaker \
-                   opie-minesweep opie-oyatzee opie-parashoot opie-qasteroids \
-                   opie-sfcave opie-snake opie-solitaire opie-tetrix opie-tictac \
-                   opie-wordgame opie-zlines opie-zsame"
-
-RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
-                          opie-handwriting-classicset opie-jumpx opie-keyboard \
-                          opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"
-
-RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \
-                        opie-mediaplayer1-libmadplugin \
-                        opie-mediaplayer1-libmodplugin \
-                        opie-mediaplayer1-libtremorplugin \
-                        opie-mediaplayer1-libwavplugin \
-                        opie-mediaplayer2 \
-                        opie-mediaplayer2-skin-default \
-                        opie-mediaplayer2-skin-default-landscape \
-                        opie-mediaplayer2-skin-pod \
-                        opie-mediaplayer2-skin-techno \
-                        opie-powerchord opie-recorder opie-tonleiter"
-
-RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-button-settings \
-                      opie-citytime opie-confeditor opie-doctab \
-                      opie-formatter opie-language opie-launcher-settings \
-                      opie-light-and-power opie-mediummount opie-networksettings \
-                      opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
-                      opie-systemtime opie-usermanager opie-icon-reload \
-                      opie-vmemo-settings"
-
-RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid opie-style-metal \
-                    opie-style-web opie-style-phase opie-theme"
-
-RDEPENDS_task-opie-datebookplugins= "opie-datebook-birthdayplugin \
-                            opie-datebook-chrisholidayplugin \
-                            opie-datebook-nationalholidayplugin"
-
-RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
-                          opie-today-fortuneplugin opie-today-mailplugin \
-                          opie-today-stocktickerplugin opie-today-todolistplugin \
-                          opie-today-weatherplugin"
-
-RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
-                 opie-mail opie-pimconverter"
-
 RDEPENDS_task-opie-bluetooth = "bluez-utils obexftp obexpush libopieobex0 \
                        opie-bluepin opie-bluetoothmanager opie-bluetoothapplet"
 
-RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"
-
 RDEPENDS_task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
-
-#
-# additional things for a >= 24mb distribution
-#
-
-RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
-                        opie-rdesktop opie-wellenreiter opie-irc \
-                        opie-mediaplayer2 \
-                        qpdf2"
-# konqueror-embedded
-
-RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
-                         opie-tetrix"
-
diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb
deleted file mode 100644
index b550d709ff..0000000000
--- a/packages/tasks/task-ossie.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Meta-package for OSSIE Software Defined Radio (SDR)"
-LICENSE = "MIT"
-RDEPENDS = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
-PR = "r0"
-
-PACKAGES = "task-ossie"
-
-ALLOW_EMPTY = "1"
-
-PACKAGE_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
-
-OSSIE_BASE = "screen procps xerces-c omniorb usrp"
-OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader"
-OSSIE_COMPONENTS = "ossie-gpp-device ossie-usrp-device ossie-soundout-device"
-OSSIE_WAVEFORMS = "ossie-demo ossie-tx-random-data ossie-log-data"
diff --git a/packages/tasks/task-python-everything_20060425.bb b/packages/tasks/task-python-everything_20060425.bb
index 5824ed39c7..37e4b99b87 100644
--- a/packages/tasks/task-python-everything_20060425.bb
+++ b/packages/tasks/task-python-everything_20060425.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml10"
+PR = "ml14"
 
 BROKEN_BECAUSE_GCC4 = "\
 		python-egenix-mx-base"
@@ -12,7 +12,12 @@ RDEPENDS = "\
 		python-constraint	\
 		python-crypto		\
 		python-dialog		\
+		python-evas			\
+		python-ecore		\
+		python-emotion		\
+		python-edje			\
 		python-pycurl		\
+		python-fam			\
 		python-fnorb		\
 		python-fpconst		\
 		python-gammu		\
@@ -56,6 +61,8 @@ RDEPENDS = "\
 		python-quicklauncher    \
 		python-scapy		\
 		python-scons		\
+		python-setuptools	\
+		python-simplejson	\
 		python-sip		\
 		python-sgmlop		\
 		python-snmplib		\
diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb
new file mode 100644
index 0000000000..4041b27536
--- /dev/null
+++ b/packages/tasks/task-sdk-base.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Basic SDK development packages"
+PR = "r1"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+DEPENDS = "task-sdk"
+
+RDEPENDS = "\
+    task-sdk-bare \
+    glibc \
+    glibc-dev \
+    libgcc \
+    alsa-dev \
+    audiofile-dev \
+    bluez-libs-dev \
+    dbus-dev \
+    expat-dev \
+    fontconfig-dev \
+    freetype-dev \
+    glib-2.0-dev \
+    gstreamer-dev \
+    libice-dev \
+    ipkg-dev \
+    jpeg-dev \
+    libapm-dev \
+    alsa-lib-dev \
+    libdisplaymigration-dev \
+    libetpan-dev \
+    libgcrypt-dev \
+    libglade-dev \
+    gnutls-dev \
+    libgpg-error-dev \
+    libidl-dev \
+    libiw-dev \
+    libmimedir-dev \
+    libpcap-dev \
+    libpixman-dev \
+    libpng-dev \
+    libschedule-dev \
+    libsm-dev \
+    libsoundgen-dev \
+    libsoup-dev \
+    libsvg-dev \
+    libtododb-dev \
+    libts-dev \
+    libxml2-dev \
+    ncurses-dev \
+    openobex-dev \
+    popt-dev \
+    readline-dev \
+    libsqlite-dev \
+    zlib-dev \
+    libxmu-dev"
diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb
new file mode 100644
index 0000000000..33f8e3a5e8
--- /dev/null
+++ b/packages/tasks/task-sdk-extra.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "SDK packages"
+PR = "r7"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "\
+    task-sdk-x11 \
+    task-sdk-x11-ext \
+    task-sdk-gpe"
+
+RDEPENDS_task-sdk-x11 = "\
+    atk-dev \
+    cairo-dev \
+    gconf-dbus-dev \
+    gtk+-dev \
+    gtk-engines-dev \
+    libsvg-cairo-dev \
+    libmatchbox-dev \
+    matchbox-desktop-dev \
+    pango-dev \
+    startup-notification-dev"
+
+RDEPENDS_task-sdk-x11-ext = "\
+    libxcursor-dev \
+    libxdmcp-dev \
+    libxft-dev \
+    libxrandr-dev \
+    libxrender-dev \
+    libxsettings-client-dev \
+    randrext-dev \
+    resourceext-dev \
+    libx11-dev \
+    libxau-dev \
+    libxcalibrate-dev \
+    xcalibrateext-dev \
+    libxcomposite-dev \
+    libxdamage-dev \
+    libxext-dev \
+    xextproto-dev \
+    libxfont-dev \
+    libxpm-dev \
+    xproto-dev \
+    libxt-dev \
+    xtrans-dev \
+    libxtst-dev"
+
+
+RDEPENDS_task-sdk-gpe = "\
+    libcontactsdb-dev \
+    esound-dev \
+    libeventdb-dev \
+    libgpepimc-dev \
+    libgpevtype-dev \
+    libgpelaunch-dev \
+    libgpewidget-dev \
+    libhandoff-dev"
+
diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb
new file mode 100644
index 0000000000..56b398b04e
--- /dev/null
+++ b/packages/tasks/task-sdk-gpephone.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "SDK task for GPE Phone Edition"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    libidn-dev \
+    libim-dev \
+    gloox-dev \
+    libabenabler-dev \
+    libcalenabler-dev \
+    libchenabler-dev \
+    libgemwidget-dev \
+    libiac-dev \
+    libim-dev \
+    liblipsevent-dev \
+    libmsgenabler-dev \
+    librecord-dev \
+    libvocenabler-dev \
+    linphone-dev \
+    "
\ No newline at end of file
diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb
new file mode 100644
index 0000000000..0c4c1f6558
--- /dev/null
+++ b/packages/tasks/task-sdk-opie.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "SDK packages for Opie"
+PR = "r6"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "task-sdk-opie"
+
+RDEPENDS_task-sdk-opie = "\
+    libopiebluez2 \
+    libopiedb2 \
+    libopiecore2 \
+    libopienet2 \
+    libopiepim2 \
+    libopieui2 \
+    libqpe1 \
+    qte \
+    libqtaux2 \
+    libmailwrapper"
diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb
new file mode 100644
index 0000000000..930de7cd2e
--- /dev/null
+++ b/packages/tasks/task-sdk-sbox-gpe.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    glib-2.0-utils \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-jpeg \
+    gdk-pixbuf-loader-gif \
+    gdk-pixbuf-loader-xpm \
+    intltool \
+    intltool-dev \
+    ipkg \
+    ipkg-utils \
+    gettext-dev \
+    pkgconfig-dev \
+    autoconf \
+    automake \
+    "
diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb
new file mode 100644
index 0000000000..2d73fe2716
--- /dev/null
+++ b/packages/tasks/task-sdk-sbox.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
+PR = "r6"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+    strace \
+    gdb \
+    sbrsh \
+    fakeroot \
+    ipkg \
+    ipkg-utils \
+    "
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index 7fa7c11322..2c2bac1289 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,129 +1,14 @@
-DESCRIPTION = "SDK packages for Opie and GPE"
-PR = "r5"
+DESCRIPTION = "SDK packages"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
     task-sdk-bare \
-    task-sdk-base \
-    task-sdk-opie \
-    task-sdk-x11 \
-    task-sdk-x11-ext \
-    task-sdk-gpe"
-
-RDEPENDS_task-sdk-bare := "\
-    glibc \
-    glibc-dev \
-    libgcc1 \
     "
 
-RDEPENDS_task-sdk-base := "\
+RDEPENDS_task-sdk-bare = "\
     glibc \
     glibc-dev \
-    libgcc1 \
-    alsa-dev \
-    audiofile-dev \
-    bluez-libs-dev \
-    dbus-dev \
-    expat-dev \
-    fontconfig-dev \
-    freetype-dev \
-    glib-2.0-dev \
-    gstreamer-dev \
-    libice-dev \
-    ipkg-dev \
-    jpeg-dev \
-    libapm-dev \
-    libasound \
-    libdisplaymigration-dev \
-    libetpan-dev \
-    libgcrypt-dev \
-    libglade-dev \
-    gnutls-dev \
-    libgpg-error-dev \
-    libidl-dev \
-    libiw-dev \
-    libmimedir-dev \
-    libpcap-dev \
-    libpixman-dev \
-    libpng-dev \
-    libschedule-dev \
-    libsm-dev \
-    libsoundgen-dev \
-    libsoup-dev \
-    libsvg-dev \
-    libtododb-dev \
-    libts-dev \
-    libxml2-dev \
-    ncurses-dev \
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    sqlite-dev \
-    zlib-dev \
-    libxmu-dev"
-
-RDEPENDS_task-sdk-x11 := "\
-    atk-dev \
-    cairo-dev \
-    gconf-dbus-dev \
-    gtk+-dev \
-    gtk-engines-dev \
-    libsvg-cairo-dev \
-    libmatchbox-dev \
-    matchbox-desktop-dev \
-    pango-dev \
-    startup-notification-dev"
-
-RDEPENDS_task-sdk-x11-ext := "\
-    compositeext-dev \
-    damageext-dev \
-    fixesext-dev \
-    libxcursor-dev \
-    libxdmcp-dev \
-    libxfixes-dev \
-    libxft-dev \
-    libxrandr-dev \
-    libxrender-dev \
-    libxsettings-client-dev \
-    randrext-dev \
-    recordext-dev \
-    renderext-dev \
-    resourceext-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcalibrate-dev \
-    xcalibrateext-dev \
-    libxcomposite-dev \
-    libxdamage-dev \
-    libxext-dev \
-    xextproto-dev \
-    libxfont-dev \
-    libxpm-dev \
-    xproto-dev \
-    libxt-dev \
-    xtrans-dev \
-    libxtst-dev"
-#    libxss-dev \
-
-RDEPENDS_task-sdk-gpe := "\
-    libcontactsdb-dev \
-    esound-dev \
-    libeventdb-dev \
-    libgpepimc-dev \
-    libgpevtype-dev \
-    libgpelaunch-dev \
-    libgpewidget-dev \
-    libhandoff-dev"
-
-RDEPENDS_task-sdk-opie := "\
-    libopiebluez2 \
-    libopiedb2 \
-    libopiecore2 \
-    libopienet2 \
-    libopiepim2 \
-    libopieui2 \
-    libqpe1 \
-    qte \
-    libqtaux2 \
-    libmailwrapper"
+    libgcc \
+    "
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 3707316c1e..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 = "r3"
+PR = "r13"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -18,6 +18,7 @@ ALLOW_EMPTY = "1"
 # The standard firmware contents and additional packages built as requirements
 # of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS.
 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
@@ -27,17 +28,17 @@ SLUGOS_STANDARD_RDEPENDS = ""
 # 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_RDEPENDS += "diffutils cpio findutils udev"
+SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils udev"
 
 # 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_RDEPENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+SLUGOS_STANDARD_RRECOMMENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
 
 # These lines add support for an X/Y/ZModem package called lrzsz
 # (this is of use for people with modified NSLU2 hardware which
 # supports a serial port.)
-SLUGOS_STANDARD_RDEPENDS += "lrzsz"
+SLUGOS_STANDARD_RRECOMMENDS += "lrzsz"
 
 # Filesystem selection.  Adding entries here adds the module to the
 # image.  The module must be built as part of nslu2-kernel (i.e. it
@@ -55,58 +56,83 @@ SLUGOS_STANDARD_RDEPENDS += "lrzsz"
 # NOTE: removing kernel-module-nfs from this list will prevent NFS
 # boot (however you can do a simple flash file system boot - no
 # attached disk - and install the nfs modules from ssh.)
-SLUGOS_STANDARD_RDEPENDS += "\
+# The altboot mechanism requires kernel-module-loop.
+SLUGOS_STANDARD_RRECOMMENDS += "\
 kernel-module-ext2 \
 kernel-module-jbd \
 kernel-module-ext3 \
 kernel-module-vfat \
-kernel-module-ntfs \
 kernel-module-isofs \
 kernel-module-udf \
+kernel-module-nfs \
+kernel-module-loop \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+
 # Add daemon required for HW RNG support
-SLUGOS_STANDARD_RDEPENDS += "\
-rng-tools \
+SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools"
+SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = ""
+SLUGOS_STANDARD_RRECOMMENDS += "\
+${SLUGOS_RNG_TOOLS_PACKAGE} \
 "
 
 # Add modules required for usb support
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
 kernel-module-ohci-hcd \
 kernel-module-uhci-hcd \
 "
 
 # Add modules required for IDE support
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
 kernel-module-libata \
 kernel-module-pata-artop \
 "
 
 # Add modules required for Network support
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-mii \
+kernel-module-ixp4xx-mac \
+kernel-module-ixp4xx-qmgr \
 kernel-module-via-velocity \
 "
 
+# Add modules required for Wifi support
+SLUGOS_STANDARD_RRECOMMENDS += "\
+madwifi-ng-modules madwifi-ng-tools wireless-tools \
+"
+
+## Other wireless tools that should be considered
+## should space be available in the rootfs
+# wpa-supplicant \
+# zd1211-firmware kernel-module-zd1211rw \
+
+# Add kexec tools for rebooting alternate kernels
+SLUGOS_STANDARD_RRECOMMENDS += "\
+kexec-tools \
+"
+
 # Add modules required for Network Console support
 # NOTE: This module is desirable for systems lacking a physical
 # console, but is usually only enabled if specific needs or issues
 # arise.  If space in the flash is at a premium, it can be omitted.
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
 kernel-module-netconsole \
 "
 
+DISTRO_EXTRA_DEPENDS ?= ""
 DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
 
-RDEPENDS += "kernel ixp4xx-npe \
+DISTRO_EXTRA_RDEPENDS ?= ""
+RDEPENDS += "\
+	kernel ixp4xx-npe \
 	base-files base-passwd netbase \
         busybox initscripts-slugos slugos-init \
         update-modules sysvinit tinylogin \
 	module-init-tools modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	portmap \
-	dropbear \
 	beep \
 	e2fsprogs-blkid \
 	util-linux-mount \
@@ -116,4 +142,7 @@ RDEPENDS += "kernel ixp4xx-npe \
 	${SLUGOS_STANDARD_RDEPENDS} \
 	${DISTRO_EXTRA_RDEPENDS}"
 
-RRECOMMENDS = "${DISTRO_EXTRA_RRECOMMENDS}"
+RRECOMMENDS += "\
+	dropbear \
+	${SLUGOS_STANDARD_RRECOMMENDS} \
+	${DISTRO_EXTRA_RRECOMMENDS}"
diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb
index bd6841f025..3a4081199b 100644
--- a/packages/tasks/task-xfce-base.bb
+++ b/packages/tasks/task-xfce-base.bb
@@ -8,7 +8,7 @@ ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 PR = "r2"
 
-RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
+RDEPENDS = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
 	xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \
 	xfce4-panel-mcs-plugins \
 	xfdesktop-mcs-plugins"