diff options
| author | Phil Blundell <pb@pbcl.net> | 2011-07-07 17:02:24 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-12 15:21:26 +0100 |
| commit | 88c6c7abbfbd57ac984547f7f0fa92b808b3d3a6 (patch) | |
| tree | 5137cc51c270f9c8bff447e3d209647e83913092 /meta/recipes-core | |
| parent | 9b36cd78ffc8271d5b2eee09bd546f2603cfebec (diff) | |
| download | poky-88c6c7abbfbd57ac984547f7f0fa92b808b3d3a6.tar.gz | |
kernel.bbclass, task-base: remove references to obsolete bluez-dtl1-workaround
(From OE-Core rev: a78b644a8aebd078b9cc51bf7d102feef8191d95)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/tasks/task-base.bb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb index 97a854c2ef..99b7e17a69 100644 --- a/meta/recipes-core/tasks/task-base.bb +++ b/meta/recipes-core/tasks/task-base.bb | |||
| @@ -80,7 +80,6 @@ RDEPENDS_task-base = "\ | |||
| 80 | ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ | 80 | ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ |
| 81 | ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ | 81 | ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ |
| 82 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ | 82 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ |
| 83 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \ | ||
| 84 | ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \ | 83 | ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \ |
| 85 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ | 84 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ |
| 86 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ | 85 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ |
| @@ -99,7 +98,6 @@ RDEPENDS_task-base = "\ | |||
| 99 | ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ | 98 | ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ |
| 100 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ | 99 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ |
| 101 | " | 100 | " |
| 102 | # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in | ||
| 103 | 101 | ||
| 104 | 102 | ||
| 105 | RRECOMMENDS_task-base = "\ | 103 | RRECOMMENDS_task-base = "\ |
| @@ -229,10 +227,7 @@ RRECOMMENDS_task-base-bluetooth = "\ | |||
| 229 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ | 227 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ |
| 230 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ | 228 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ |
| 231 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ | 229 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ |
| 232 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \ | ||
| 233 | " | 230 | " |
| 234 | # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in | ||
| 235 | # kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer. | ||
| 236 | 231 | ||
| 237 | RDEPENDS_task-base-irda = "\ | 232 | RDEPENDS_task-base-irda = "\ |
| 238 | irda-utils" | 233 | irda-utils" |