summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-08-27 21:57:41 +0000
committerRichard Purdie <richard@openedhand.com>2006-08-27 21:57:41 +0000
commit504535f20b2580e31a660167457ee83c95f7b6e5 (patch)
treeab2503c36c639c47bf7a5fa46672460172dbd866
parent2a01021aaffde56326d0bce0bbf0bb5bfe948b58 (diff)
downloadopenembedded-core-504535f20b2580e31a660167457ee83c95f7b6e5.tar.gz
openembedded-core-504535f20b2580e31a660167457ee83c95f7b6e5.tar.bz2
openembedded-core-504535f20b2580e31a660167457ee83c95f7b6e5.tar.xz
openembedded-core-504535f20b2580e31a660167457ee83c95f7b6e5.zip
Sync task.base after merging upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@655 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/tasks/task-base.bb22
1 files changed, 10 insertions, 12 deletions
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 2763f3b51..61b874410 100644
--- 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"