summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-08-03 09:10:30 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-07 12:13:03 +0100
commit30352f3d84344bff8c06625f9674947417f6e8e1 (patch)
treef35a59f1074b223a1feb5735be88a4ba01d1ee0d /meta/recipes-multimedia
parent8239a8b12a38f69c649d44fb8d4c5ebbb8ad17d9 (diff)
downloadpoky-30352f3d84344bff8c06625f9674947417f6e8e1.tar.gz
alsa-lib: Cleanup packaging
Cleans up the packaging by moving libasound.so.2 back into the alsa-lib package which was previously empty. Previously, it was difficult to create an image that had libasound.so.2, then create an SDK from that image that had the proper development files, because the only way to get libasound.so.2 was to do: IMAGE_INSTALL += "libasound" This however caused a problem because all of the development files that would be desired in the SDK were located in alsa-lib-dev, which wouldn't be included because alsa-lib wasn't included, and it was impossible to include alsa-lib because it was an empty package that was culled. (From OE-Core rev: c2fc6f87f8bbf4bc28f9adc45f116b2a692ea804) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb
index 6364e9eafa..25e7a3c6b7 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb
@@ -18,19 +18,18 @@ EXTRA_OECONF += " \
18 --disable-python \ 18 --disable-python \
19" 19"
20 20
21PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc" 21PACKAGES =+ "alsa-server alsa-conf alsa-doc"
22 22
23FILES_libasound = "${libdir}/libasound.so.*"
24FILES_alsa-server = "${bindir}/*" 23FILES_alsa-server = "${bindir}/*"
25FILES_alsa-conf = "${datadir}/alsa/" 24FILES_alsa-conf = "${datadir}/alsa/"
26 25
27RDEPENDS_libasound = "alsa-conf" 26RDEPENDS_${PN}_class-target = "alsa-conf"
28
29# alsa-lib gets automatically added to alsa-lib-dev dependencies, but the
30# alsa-lib package doesn't exist. libasound is the real library package.
31RDEPENDS_${PN}-dev = "libasound"
32 27
33# upgrade path 28# upgrade path
29RPROVIDES_${PN} = "libasound"
30RREPLACES_${PN} = "libasound"
31RCONFLICTS_${PN} = "libasound"
32
34RPROVIDES_${PN}-dev = "alsa-dev" 33RPROVIDES_${PN}-dev = "alsa-dev"
35RREPLACES_${PN}-dev = "alsa-dev" 34RREPLACES_${PN}-dev = "alsa-dev"
36RCONFLICTS_${PN}-dev = "alsa-dev" 35RCONFLICTS_${PN}-dev = "alsa-dev"