summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Domenech Goulart <mario@ossystems.com.br>2012-12-03 18:06:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-13 15:21:44 (GMT)
commitf018e39132ecc1f4e7753469cc194d38d4eee45e (patch)
tree41d4f6aee91a6b0c7a9601ef0cdba1ffa881d1c2
parent24bcf6aa08c70db86767757ed5f5f76d727fe4d2 (diff)
downloadpoky-f018e39132ecc1f4e7753469cc194d38d4eee45e.tar.gz
pulseaudio: explicitly set --with-database=simple
The default value for --with-database is "auto". So, if some package installs a database library and pulseaudio auto detects, that library will be added to the dependencies list, causing a dependency error at do_rootfs time. For example, samba installs libtdb, which is one of the pulseaudio supported databases. (From OE-Core rev: 400ebfde27a2de4014d4711ac80a87116ad17e55) Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc1
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 74f34b1..8f8f567 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -39,6 +39,7 @@ EXTRA_OECONF = "\
39 --with-access-group=audio \ 39 --with-access-group=audio \
40 --disable-openssl \ 40 --disable-openssl \
41 --disable-xen \ 41 --disable-xen \
42 --with-database=simple \
42" 43"
43 44
44PARALLEL_MAKE = "" 45PARALLEL_MAKE = ""
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index d25b424..07410a4 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r8" 3PR = "r9"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6