From c2fc6f87f8bbf4bc28f9adc45f116b2a692ea804 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Fri, 3 Aug 2018 09:10:30 -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. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'meta/recipes-multimedia/alsa') 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 += " \ --disable-python \ " -PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc" +PACKAGES =+ "alsa-server alsa-conf alsa-doc" -FILES_libasound = "${libdir}/libasound.so.*" 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 1.2.3-korg