task-base: synchronize with OE version, few features removed

- OE version of task-base generate task-base-FEATURE package for each
  entry from MACHINE_FEATURES.
- some entries were removed because Poky does not support them
- packages are generated only for supported features + BT and WiFi


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2053 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 239 insertions, 149 deletions

diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 977daefbc7..305898d2dd 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,145 +1,217 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r10"
-
-PACKAGES = "task-base task-base-dbg task-base-dev"
+PR = "r37"
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = ' \
+            task-base task-base-dev task-base-dbg\
+            task-base-extended task-base-extended-dev task-base-extended-dbg \
+            task-distro-base task-distro-base-dev task-distro-base-dbg \
+            task-machine-base task-machine-base-dev task-machine-base-dbg \
+            \
+            ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone task-base-phone-dev task-base-phone-dbg", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard task-base-keyboard-dev task-base-keyboard-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia task-base-pcmcia-dev task-base-pcmcia-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen task-base-screen-dev task-base-screen-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial task-base-serial-dev task-base-serial-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen task-base-touchscreen-dev task-base-touchscreen-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget task-base-usbgadget-dev task-base-usbgadget-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost task-base-usbhost-dev task-base-usbhost-dbg", "", d)} \
+            task-base-bluetooth task-base-bluetooth-dev task-base-bluetooth-dbg \
+            task-base-wifi task-base-wifi-dev task-base-wifi-dbg \
+            \
+            ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs task-base-cramfs-dev task-base-cramfs-dbg", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec task-base-ipsec-dev task-base-ipsec-dbg", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6 task-base-ipv6-dev task-base-ipv6-dbg", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \
+        \
+            task-base-kernel26 task-base-kernel26-dev task-base-kernel26-dbg \
+            '
 
 ALLOW_EMPTY = "1"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "all"
 
-# Valid only in MACHINE_FEATURES:
 #
-# kernel24
-# kernel26
-# apm
-
-# Valid only in DISTRO_FEATURES:
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
-# nfs
-# smbfs
-# ipsec
-# wifi
-# ppp
+PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
 
-# Valid COMBINED_FEATURES:
-# (These features need to be supported by both the machine and the distro)
 #
-# alsa
-# bluetooth
-# ext2
-# irda
-# pcmcia
-# usbgadget
-# usbhost
+# linux-hotplug or none
+#
+HOTPLUG ?= " "
 
+#
+# dropbear, openssh or none
+#
+DISTRO_SSH_DAEMON ?= "dropbear"
 
-MACHINE_FEATURES ?= "kernel26"
-DISTRO_FEATURES ?= ""
+#
+# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
+#
+PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
 
-DISTRO_EXTRA_RDEPENDS ?= ""
-DISTRO_EXTRA_RRECOMMENDS ?= ""
-MACHINE_EXTRA_RDEPENDS ?= ""
-MACHINE_EXTRA_RRECOMMENDS ?= ""
+#
+# 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 contain stuff needed for base system (machine related)
+#
+RDEPENDS_task-base = "\
+    task-poky-boot \
+    task-distro-base \
+    task-machine-base \
+    ${DISTRO_SSH_DAEMON} \
+    ${HOTPLUG} \
+    \
+    task-base-kernel26 \
+    ${@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('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)
+}
 
-COMBINED_FEATURES = "\
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}"
-
+#
+# packages added by distribution
+#
+RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
+RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
 
 #
-# task-base 
+# packages added by machine config
 #
-RDEPENDS_task-base = "\
-    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", "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", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-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", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
-    ${MACHINE_EXTRA_RRECOMMENDS} \
-    ${DISTRO_EXTRA_RRECOMMENDS}"
-
-task-base-kernel26-rdepends = "\
-    udev \
-    keymaps \
+RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
+RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
+
+RDEPENDS_task-base-kernel26 = "\
     sysfsutils \
     module-init-tools"
 
-task-base-kernel26-extras-rrecommends = "\
+RRECOMMENDS_task-base-kernel26 = "\
     kernel-module-input \
-    kernel-module-uinput"
+    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-apm-rdepends = "\
+RDEPENDS_task-base-pci = "\
+    pciutils"
+
+RDEPENDS_task-base-acpi = "\
+    acpid"
+
+RDEPENDS_task-base-apm = "\
     apm \
-    apmd \
-    ${@base_contains("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}"
+    apmd"
 
-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 \
-    alsa-conf"
+    alsa-utils-alsamixer"
 
-task-base-alsa-rrecommends = "\
+#
+# alsa-state is machine related so can be missing in feed, OSS support is optional
+#
+RRECOMMENDS_task-base-alsa = "\
     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", "prism-firmware", "",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-hostap-cs \
     kernel-module-ide-cs \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",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-bluetooth-rrecommends = "\
+task-base-pcmcia26 = "\
+    ${@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)}"
+
+RDEPENDS_task-base-bluetooth = "\ 
+    bluez-utils"
+
+RRECOMMENDS_task-base-bluetooth = "\
     kernel-module-bluetooth \
     kernel-module-l2cap \
     kernel-module-rfcomm \
@@ -148,32 +220,42 @@ task-base-bluetooth-rrecommends = "\
     kernel-module-hidp \
     kernel-module-hci-uart \
     kernel-module-sco \
-    ${@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', '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 = "\
+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 \
-    kernel-module-irnet \
+    ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \
     kernel-module-irport \
-    kernel-module-irtty "
+    kernel-module-irtty \
+    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"
 
-task-base-usbhost-rrecommends = "\
+RDEPENDS_task-base-usbhost = "\
+    usbutils "
+
+RRECOMMENDS_task-base-usbhost = "\
+    kernel-module-uhci-hcd \
     kernel-module-ohci-hcd \
+    kernel-module-ehci-hcd \
     kernel-module-usbcore \
     kernel-module-usbhid \
     kernel-module-usbnet \
@@ -181,32 +263,38 @@ task-base-usbhost-rrecommends = "\
     kernel-module-scsi-mod \
     kernel-module-usbmouse \
     kernel-module-mousedev \
-    kernel-module-hci-usb \
     kernel-module-usbserial \
-    kernel-module-usb-storage \
-    kernel-module-ir-usb"
+    kernel-module-usb-storage "
 
-task-distro-ppp-rdepends = "\
+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"
+    kernel-module-ppp-generic \
+    kernel-module-ppp-mppe \
+    kernel-module-slhc"
 
-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 \
-    hostap-utils \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
     wpa-supplicant"
 
-task-distro-wifi-rrecommends = "\
+RRECOMMENDS_task-base-wifi = "\
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
     kernel-module-ieee80211-crypt \
     kernel-module-ieee80211-crypt-ccmp \
     kernel-module-ieee80211-crypt-tkip \
@@ -216,36 +304,38 @@ task-distro-wifi-rrecommends = "\
     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-rrecommends = "\
-    kernel-module-nfs \
-    kernel-module-lockd \
-    kernel-module-sunrpc"
-
-
-# Tosort
-# kernel-module-ipv6 
-# kernel-module-ipsec
-# 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 
-# kernel-module-ext2
-# kernel-module-nfs
-# kernel-module-sco 
-# kernel-module-af_packet
-# kernel-module-ip-gre 
-# kernel-module-ip-tables 
-# kernel-module-ipip
-# kernel-module-des 
-# kernel-module-md5
-# kernel-module-8250
-# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz 
+#
+# task-base-nfs provides ONLY client support - server is in nfs-utils package
+#
+RDEPENDS_task-base-nfs = "\
+    portmap"
+
+RRECOMMENDS_task-base-nfs = "\
+    kernel-module-nfs "
+
+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 "