summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-04-23 09:03:52 +0000
committerKoen Kooi <koen@openembedded.org>2007-04-23 09:03:52 +0000
commit99ad35ff9b91d5ca4e46267e54cd664ac3001f58 (patch)
treefae99e49d92f04c5c3e64ba311a25b59c9d1e399 /packages
parent45a6f8272e4912e26b7a6e91c8a443c25e32b623 (diff)
task-base: make task-boot machine specific
Diffstat (limited to 'packages')
-rw-r--r--packages/tasks/task-base.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 42f585635e..7618464446 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r27"
+PR = "r28"
PACKAGES = 'task-boot \
task-base \
@@ -41,6 +41,7 @@ PACKAGE_ARCH = "all"
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-boot = "${MACHINE_ARCH}"
PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
@@ -199,7 +200,7 @@ RDEPENDS_task-base-pcmcia = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',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)}"
+ "
RRECOMMENDS_task-base-pcmcia = "\
${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
@@ -213,11 +214,10 @@ RRECOMMENDS_task-base-pcmcia = "\
task-base-pcmcia24 = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)}"
+ "
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 = "\