summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-28 17:36:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-02 16:22:48 +0000
commit01954b9c65c979e03b7f07ab30889ceb20ed0d05 (patch)
treee8f03b402cef1271f117667161e128d8c8f71768 /meta/conf
parent2b918b623bf8add454c3726dd4ee189230e6fcbc (diff)
downloadpoky-01954b9c65c979e03b7f07ab30889ceb20ed0d05.tar.gz
qt4: make pulseaudio support conditional upon DISTRO_FEATURES
Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in phonon within Qt4 if it is not present; otherwise it is a race condition as to whether it is enabled or disabled or breaks the build. Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving existing distro configurations unaffected. (From OE-Core rev: b82c216c1ee8e2a009e87856b7adad08f7f50482) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f67bf5073e..18879c82fe 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -700,7 +700,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
700MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" 700MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
701IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 701IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
702 702
703DISTRO_FEATURES_BACKFILL = "" 703DISTRO_FEATURES_BACKFILL = "pulseaudio"
704DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}" 704DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}"
705 705
706COMBINED_FEATURES = "\ 706COMBINED_FEATURES = "\