summaryrefslogtreecommitdiffstats
path: root/meta
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 /meta
parent2a01021aaffde56326d0bce0bbf0bb5bfe948b58 (diff)
downloadpoky-504535f20b2580e31a660167457ee83c95f7b6e5.tar.gz
Sync task.base after merging upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@655 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-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 2763f3b51b..61b8744105 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Machine Tasks for OpenedHand Poky" 1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
2MAINTAINER = "Richard Purdie <richard@openedhand.com>" 2MAINTAINER = "Richard Purdie <richard@openedhand.com>"
3PR = "r0" 3PR = "r0"
4 4
@@ -15,6 +15,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
15# kernel26 15# kernel26
16# apm 16# apm
17 17
18# Valid only in DISTO_FEATURES:
19#
20# nfs
21# smbfs
22# ipsec
23# wifi
24# ppp
25
18# Valid COMBINED_FEATURES: 26# Valid COMBINED_FEATURES:
19# (These features need to be supported by both the machine and the distro) 27# (These features need to be supported by both the machine and the distro)
20# 28#
@@ -26,13 +34,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
26# usbgadget 34# usbgadget
27# usbhost 35# usbhost
28 36
29# Valid only in DISTO_FEATURES:
30#
31# nfs
32# smbfs
33# ipsec
34# wifi
35# ppp
36 37
37MACHINE_FEATURES ?= "kernel26" 38MACHINE_FEATURES ?= "kernel26"
38DISTRO_FEATURES ?= "" 39DISTRO_FEATURES ?= ""
@@ -61,7 +62,6 @@ COMBINED_FEATURES = "\
61RDEPENDS_task-base = "\ 62RDEPENDS_task-base = "\
62 kernel \ 63 kernel \
63 ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ 64 ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
64# ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rdepends}", "",d)} \
65 ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ 65 ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
66 ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \ 66 ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
67 ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \ 67 ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
@@ -93,6 +93,7 @@ RRECOMMENDS_task-base = "\
93 93
94# 94#
95# task-base-oh-minimal 95# task-base-oh-minimal
96# An example of a small cut down machine configuration
96# 97#
97RDEPENDS_task-base-oh-minimal = "\ 98RDEPENDS_task-base-oh-minimal = "\
98 kernel \ 99 kernel \
@@ -110,9 +111,6 @@ task-base-kernel26-rdepends = "\
110 sysfsutils \ 111 sysfsutils \
111 module-init-tools" 112 module-init-tools"
112 113
113#task-base-kernel26-extras-rdepends = "\
114# udev-utils"
115
116task-base-kernel26-extras-rrecommends = "\ 114task-base-kernel26-extras-rrecommends = "\
117 kernel-module-input \ 115 kernel-module-input \
118 kernel-module-uinput" 116 kernel-module-uinput"