Sync task.base after merging upstream

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

diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 2763f3b51b58f5c0f7775d37eaa3cdaa83f4f67b..61b87441056ca2caf6cc060a0c56484e53d104a9 100644 (file)
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Machine Tasks for OpenedHand Poky"
+DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
 PR = "r0"
 
@@ -15,6 +15,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # kernel26
 # apm
 
+# Valid only in DISTO_FEATURES:
+#
+# nfs
+# smbfs
+# ipsec
+# wifi
+# ppp
+
 # Valid COMBINED_FEATURES:
 # (These features need to be supported by both the machine and the distro)
 #
@@ -26,13 +34,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # usbgadget
 # usbhost
 
-# Valid only in DISTO_FEATURES:
-#
-# nfs
-# smbfs
-# ipsec
-# wifi
-# ppp
 
 MACHINE_FEATURES ?= "kernel26"
 DISTRO_FEATURES ?= ""
@@ -61,7 +62,6 @@ COMBINED_FEATURES = "\
 RDEPENDS_task-base = "\
     kernel \
     ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
-#    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-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)} \
@@ -93,6 +93,7 @@ RRECOMMENDS_task-base = "\
 
 #
 # task-base-oh-minimal
+# An example of a small cut down machine configuration
 #
 RDEPENDS_task-base-oh-minimal = "\
     kernel \
@@ -110,9 +111,6 @@ task-base-kernel26-rdepends = "\
     sysfsutils \
     module-init-tools"
 
-#task-base-kernel26-extras-rdepends = "\
-#    udev-utils"
-
 task-base-kernel26-extras-rrecommends = "\
     kernel-module-input \
     kernel-module-uinput"