summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-06-29 07:52:39 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-06-29 07:52:39 +0000
commitdedb4d34e207c7cb1cb4bf40c1f82fc49c9169d3 (patch)
tree0dbe9132fe8e3c6d8d0a2731f56a5bf897f69541 /meta
parentcc847ef56c50bca1a3ead2a92c92eb62b1a6d9a8 (diff)
downloadpoky-dedb4d34e207c7cb1cb4bf40c1f82fc49c9169d3.tar.gz
task-base: removed dropbear, hotplug, task-poky-boot from dependencies
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2058 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/tasks/task-base.bb17
1 files changed, 1 insertions, 16 deletions
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 305898d2dd..37150e485f 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" 1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
2PR = "r37" 2PR = "r38"
3 3
4PROVIDES = "${PACKAGES}" 4PROVIDES = "${PACKAGES}"
5PACKAGES = ' \ 5PACKAGES = ' \
@@ -11,7 +11,6 @@ PACKAGES = ' \
11 ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \ 11 ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \
12 ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \ 12 ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \
13 ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \ 13 ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \
14 ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone task-base-phone-dev task-base-phone-dbg", "",d)} \
15 ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \ 14 ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \
16 ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \ 15 ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \
17 ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \ 16 ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \
@@ -48,16 +47,6 @@ PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
48PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}" 47PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
49 48
50# 49#
51# linux-hotplug or none
52#
53HOTPLUG ?= " "
54
55#
56# dropbear, openssh or none
57#
58DISTRO_SSH_DAEMON ?= "dropbear"
59
60#
61# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others 50# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
62# 51#
63PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " 52PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
@@ -72,11 +61,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
72# task-base contain stuff needed for base system (machine related) 61# task-base contain stuff needed for base system (machine related)
73# 62#
74RDEPENDS_task-base = "\ 63RDEPENDS_task-base = "\
75 task-poky-boot \
76 task-distro-base \ 64 task-distro-base \
77 task-machine-base \ 65 task-machine-base \
78 ${DISTRO_SSH_DAEMON} \
79 ${HOTPLUG} \
80 \ 66 \
81 task-base-kernel26 \ 67 task-base-kernel26 \
82 ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \ 68 ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
@@ -97,7 +83,6 @@ RDEPENDS_task-base = "\
97 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ 83 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
98 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ 84 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
99 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ 85 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
100 ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
101 " 86 "
102 87
103RDEPENDS_task-base-extended = "\ 88RDEPENDS_task-base-extended = "\