diff options
Diffstat (limited to 'meta/packages/tasks/task-base.bb')
-rw-r--r-- | meta/packages/tasks/task-base.bb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb index c943d7c1ed..ed5e698bb5 100644 --- a/meta/packages/tasks/task-base.bb +++ b/meta/packages/tasks/task-base.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" | 1 | DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" |
2 | PR = "r48" | 2 | PR = "r49" |
3 | 3 | ||
4 | PROVIDES = "${PACKAGES}" | 4 | PROVIDES = "${PACKAGES}" |
5 | PACKAGES = ' \ | 5 | PACKAGES = ' \ |
@@ -202,7 +202,11 @@ RRECOMMENDS_task-base-bluetooth = "\ | |||
202 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ | 202 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ |
203 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ | 203 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ |
204 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ | 204 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ |
205 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)}" | 205 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ |
206 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \ | ||
207 | " | ||
208 | # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in | ||
209 | # kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer. | ||
206 | 210 | ||
207 | RDEPENDS_task-base-irda = "\ | 211 | RDEPENDS_task-base-irda = "\ |
208 | irda-utils" | 212 | irda-utils" |
@@ -279,6 +283,8 @@ RRECOMMENDS_task-base-wifi = "\ | |||
279 | kernel-module-ieee80211-crypt-wep \ | 283 | kernel-module-ieee80211-crypt-wep \ |
280 | kernel-module-ecb \ | 284 | kernel-module-ecb \ |
281 | kernel-module-arc4 \ | 285 | kernel-module-arc4 \ |
286 | kernel-module-crypto_algapi \ | ||
287 | kernel-module-cryptomgr \ | ||
282 | kernel-module-michael-mic \ | 288 | kernel-module-michael-mic \ |
283 | kernel-module-aes" | 289 | kernel-module-aes" |
284 | 290 | ||