summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-02-15 09:13:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:52 -0800
commit5424dc2a21916216300449cf5c2724ca549aa5e5 (patch)
tree0386551b7ba7ee9313c13cf2d9ac147eecfd1d93
parent06fe5024e283a105358259b751a5cbc5e33f5c77 (diff)
downloadpoky-5424dc2a21916216300449cf5c2724ca549aa5e5.tar.gz
alsa-lib: merge alsa-conf-base into alsa-conf
As far as I can see, there's no benefit in having separate alsa-conf and alsa-conf-base packages. libasound depended on both, so it was not really possible to only install alsa-conf-base. (From OE-Core rev: 04b57e357bc016d174015a56077bb026ad9bb498) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb14
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
index 34a7d8802e..191a0367de 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
@@ -25,18 +25,12 @@ EXTRA_OECONF += "--disable-python"
25 25
26EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " 26EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no "
27 27
28PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc" 28PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc"
29FILES_libasound = "${libdir}/libasound.so.*" 29FILES_libasound = "${libdir}/libasound.so.*"
30FILES_alsa-server = "${bindir}/*" 30FILES_alsa-server = "${bindir}/*"
31FILES_alsa-conf = "${datadir}/alsa/" 31FILES_alsa-conf = "${datadir}/alsa/"
32FILES_alsa-conf-base = "\
33${datadir}/alsa/alsa.conf \
34${datadir}/alsa/cards/aliases.conf \
35${datadir}/alsa/pcm/default.conf \
36${datadir}/alsa/pcm/dmix.conf \
37${datadir}/alsa/pcm/dsnoop.conf"
38 32
39RDEPENDS_libasound = "alsa-conf-base alsa-conf" 33RDEPENDS_libasound = "alsa-conf"
40 34
41# alsa-lib gets automatically added to alsa-lib-dev dependencies, but the 35# alsa-lib gets automatically added to alsa-lib-dev dependencies, but the
42# alsa-lib package doesn't exist. libasound is the real library package. 36# alsa-lib package doesn't exist. libasound is the real library package.
@@ -46,3 +40,7 @@ RDEPENDS_${PN}-dev = "libasound"
46RPROVIDES_${PN}-dev = "alsa-dev" 40RPROVIDES_${PN}-dev = "alsa-dev"
47RREPLACES_${PN}-dev = "alsa-dev" 41RREPLACES_${PN}-dev = "alsa-dev"
48RCONFLICTS_${PN}-dev = "alsa-dev" 42RCONFLICTS_${PN}-dev = "alsa-dev"
43
44RPROVIDES_alsa-conf = "alsa-conf-base"
45RREPLACES_alsa-conf = "alsa-conf-base"
46RCONFLICTS_alsa-conf = "alsa-conf-base"