diff options
| author | Rod Whitby <rod@whitby.id.au> | 2009-02-11 04:52:20 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2009-02-11 04:52:20 +0000 |
| commit | 04463be45aa5e5291bdb30d38b416d899b4b366f (patch) | |
| tree | 54b9b903f9ea5fda75c265a9ab4d2fa1e3db308d /packages/tasks | |
| parent | a19c7f36303e21667ca9390bdb49bfc10d6ad3dc (diff) | |
| parent | f9167aed6eedb9ce4ba347dc36c2d2b16a1e435c (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-base.bb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 504332f9a5..c60ae4ff0b 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -61,6 +61,15 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","" DISTRO_SSH_DAEMON ?= "dropbear" # +# bluetooth manager +# +DISTRO_BLUETOOTH_MANAGER ?= "\ + blueprobe \ + bluez-utils \ + bluez-utils-compat \ + " + +# # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others # PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " @@ -234,10 +243,8 @@ task-base-pcmcia26 = "\ # Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! -RDEPENDS_task-base-bluetooth = "\ - blueprobe \ - bluez-utils \ - bluez-utils-compat \ +RDEPENDS_task-base-bluetooth = "\ + ${DISTRO_BLUETOOTH_MANAGER} \ " RRECOMMENDS_task-base-bluetooth = "\ |