diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-07-08 01:28:52 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-07-08 01:28:52 +0000 |
| commit | 4bac3cbba68039a835ae747a45b1c76995da7552 (patch) | |
| tree | 67df03fae90a5a84ec6b1b2b969260c92f96239c /packages/tasks | |
| parent | 154af708451cce6148f55a8942c03d29d90c7fc7 (diff) | |
| parent | ce990bd80f75f0d33d15e9f21f516419f5675390 (diff) | |
merge of '5076ed26abde44cf0e9a27bb249bb0829b19ea16'
and '9a0ea0926b71ceec737d423255d8fce2074cc8b7'
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-base.bb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 1ef70f63cd..c7dbf15388 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 = "r38" +PR = "r39" DEPENDS = "task-boot" PROVIDES = "${PACKAGES}" @@ -239,7 +239,11 @@ RRECOMMENDS_task-base-bluetooth = "\ ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)}" + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \ + " +# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in +# kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer. RDEPENDS_task-base-irda = "\ irda-utils" |