From b9681288589165c7d7356638dbd0d1cc8c9adf42 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Tue, 7 Aug 2018 08:40:04 -0500 Subject: 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: 6c3438a62d10f155cd6a391bdb2f1939fc4774ec) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie (cherry picked from commit 30352f3d84344bff8c06625f9674947417f6e8e1) Change-Id: I2fb065b7e00569ba3a6aac631ac863999455bfb2 Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb index c5bf107e5e..0f1e2db8d7 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb @@ -19,18 +19,17 @@ EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " EXTRA_OECONF += "--disable-python" -PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc" -FILES_libasound = "${libdir}/libasound.so.*" +PACKAGES =+ "alsa-server alsa-conf alsa-doc" FILES_alsa-server = "${bindir}/*" FILES_alsa-conf = "${datadir}/alsa/" -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. -RDEPENDS_${PN}-dev = "libasound" +RDEPENDS_${PN}_class-target = "alsa-conf" # upgrade path +RPROVIDES_${PN} = "libasound" +RREPLACES_${PN} = "libasound" +RCONFLICTS_${PN} = "libasound" + RPROVIDES_${PN}-dev = "alsa-dev" RREPLACES_${PN}-dev = "alsa-dev" RCONFLICTS_${PN}-dev = "alsa-dev" -- cgit v1.2.3-54-g00ecf