alsa-lib: Cleanup packaging
PATCH 1/1 alsa-lib: Cleanup packaging
From: Joshua Watt <[email protected]>
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.
Change-Id: I2fb065b7e00569ba3a6aac631ac863999455bfb2
--- meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb +6 -7
@@ -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"
Signature · 1 line
2.17.1
Quoted 21 lines · Joshua Watt
From: Joshua Watt <[email protected]>
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.
Quoted 5 lines
Signed-off-by Joshua Watt <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 30352f3d84344bff8c06625f9674947417f6e8e1)Change-Id: I2fb065b7e00569ba3a6aac631ac863999455bfb2
Oops. Sorry for the Change-ID... my git commit hooks get the better of me sometimes :) You can remove this when you apply, or I can push up a V2 if you prefer.
Quoted 37 lines
--- meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb +0
-0@@ -19,18 +19,17 @@ EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)}"
EXTRA_OECONF+= "--disable-python"meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb +1
-5-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.meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb +5
-1-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"
Signature · 1 line
Joshua Watt <[email protected]>