aboutsummaryrefslogtreecommitdiffstats
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:29:19 -0800
commit04b57e357bc016d174015a56077bb026ad9bb498 (patch)
treec45d333e2bdc607caae0266f28a86054b03c68cd
parent1ed6f860de22321342404a49ba78658153ff5eb8 (diff)
downloadopenembedded-core-contrib-04b57e357bc016d174015a56077bb026ad9bb498.tar.gz
openembedded-core-contrib-04b57e357bc016d174015a56077bb026ad9bb498.tar.bz2
openembedded-core-contrib-04b57e357bc016d174015a56077bb026ad9bb498.zip
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. Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 34a7d8802ef..191a0367de0 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"
EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no "
-PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc"
+PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc"
FILES_libasound = "${libdir}/libasound.so.*"
FILES_alsa-server = "${bindir}/*"
FILES_alsa-conf = "${datadir}/alsa/"
-FILES_alsa-conf-base = "\
-${datadir}/alsa/alsa.conf \
-${datadir}/alsa/cards/aliases.conf \
-${datadir}/alsa/pcm/default.conf \
-${datadir}/alsa/pcm/dmix.conf \
-${datadir}/alsa/pcm/dsnoop.conf"
-RDEPENDS_libasound = "alsa-conf-base alsa-conf"
+RDEPENDS_libasound = "alsa-conf"
# alsa-lib gets automatically added to alsa-lib-dev dependencies, but the
# alsa-lib package doesn't exist. libasound is the real library package.
@@ -46,3 +40,7 @@ RDEPENDS_${PN}-dev = "libasound"
RPROVIDES_${PN}-dev = "alsa-dev"
RREPLACES_${PN}-dev = "alsa-dev"
RCONFLICTS_${PN}-dev = "alsa-dev"
+
+RPROVIDES_alsa-conf = "alsa-conf-base"
+RREPLACES_alsa-conf = "alsa-conf-base"
+RCONFLICTS_alsa-conf = "alsa-conf-base"