diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-11-30 21:44:30 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-11-30 21:44:30 +0000 |
| commit | 8325614d566291f61a1a9feea61cba07f070a754 (patch) | |
| tree | 9ebf48e5ff04055cd8190b64a5d0443f1b7bf189 /packages/tasks | |
| parent | 382ebf96914d2b1a244a7b8cf4c4d9a1d1dff761 (diff) | |
| parent | f40b57f74954ef21a7a8b13286ae7398ce3fa99a (diff) | |
merge of '12edb579fffee6ffcbbed6a66d80c97b7705d000'
and '48ac4b4de7e34d9fabc14d0f69415e4c1168e98b'
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-base.bb | 12 | ||||
| -rw-r--r-- | packages/tasks/task-proper-tools.bb | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 3f919c7766..1a41f13129 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 = "r14" +PR = "r15" PACKAGES = "task-base \ task-base-minimal \ @@ -49,6 +49,7 @@ DISTRO_CORE_PACKAGE ?= "task-base-core-default" RDEPENDS_task-base = "\ ${DISTRO_CORE_PACKAGE} \ kernel \ + ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \ ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \ @@ -123,6 +124,8 @@ RDEPENDS_task-base-core-default = '\ RRECOMMENDS_task-base-core-default = '\ dropbear ' +task-base-kernel24-rdepends = "\ + linux-hotplug " task-base-kernel26-rdepends = "\ udev \ @@ -176,6 +179,13 @@ task-base-pcmcia-rrecommends = "\ kernel-module-pcnet-cs \ kernel-module-serial-cs \ kernel-module-ide-cs \ + ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " + +task-base-pcmcia24-rrecommends = "\ + ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \ + ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}" + +task-base-pcmcia26-rrecommends = "\ ${@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)}" diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb index 5520864c82..dccdd13bdf 100644 --- a/packages/tasks/task-proper-tools.bb +++ b/packages/tasks/task-proper-tools.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Proper tools for busybox haters" -PR = "r1" +PR = "r2" +PACKAGE_ARCH = "all" ALLOW_EMPTY_${PN} = "1" RDEPENDS = "\ |