summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-29 21:44:12 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-29 21:44:12 +0000
commit81dca733e3b76f02f996525c8934d43541619fab (patch)
tree66d6553d0ec287ee801efe93c6d598f0ba7618a0
parent837f7e086768f3a7d0bb0a6a3ac0d217feb46deb (diff)
downloadpoky-81dca733e3b76f02f996525c8934d43541619fab.tar.gz
task-base: Add bluez-dtl1 workaround from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2602 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/tasks/task-base.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 642ee8bebe..7b45ab61d9 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" 1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
2PR = "r42" 2PR = "r43"
3 3
4PROVIDES = "${PACKAGES}" 4PROVIDES = "${PACKAGES}"
5PACKAGES = ' \ 5PACKAGES = ' \
@@ -62,6 +62,7 @@ RDEPENDS_task-base = "\
62 ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ 62 ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
63 ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ 63 ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
64 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ 64 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
65 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
65 ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \ 66 ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
66 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ 67 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
67 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ 68 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
@@ -72,6 +73,7 @@ RDEPENDS_task-base = "\
72 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ 73 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
73 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ 74 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
74 " 75 "
76# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
75 77
76RDEPENDS_task-base-extended = "\ 78RDEPENDS_task-base-extended = "\
77 task-base \ 79 task-base \