alsa-lib: Cleanup packaging
PATCH v2 1/1 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.
--- meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb +6 -7
@@ -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}-dev = "libasound" +RREPLACES_${PN}-dev = "libasound" +RCONFLICTS_${PN}-dev = "libasound" + RPROVIDES_${PN}-dev = "alsa-dev" RREPLACES_${PN}-dev = "alsa-dev" RCONFLICTS_${PN}-dev = "alsa-dev"
Signature · 1 line
2.17.1
meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb EXTRA_OECONF += " \ · line 31
Quoted 4 lines · Joshua Watt
# upgrade pathmeta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb +3
-0+RPROVIDES_${PN}-dev = "libasound" +RREPLACES_${PN}-dev = "libasound" +RCONFLICTS_${PN}-dev = "libasound"
Shouldn't this just be PN?
Ross
Quoted 7 lines · Ross
meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb EXTRA_OECONF += " \ · line 31
Quoted 4 lines · Joshua Watt
# upgrade pathmeta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb +3
-0+RPROVIDES_${PN}-dev = "libasound" +RREPLACES_${PN}-dev = "libasound" +RCONFLICTS_${PN}-dev = "libasound"Shouldn't this just be PN?
Indeed! Good catch. I'll try to remember the in-reply-to this time ;)
Quoted 2 lines
Ross
Signature · 1 line
Joshua Watt <[email protected]>
PATCH v3 1/1 alsa-lib: Cleanup packaging
In reply to Joshua WattCleans 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.
--- meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
meta/recipes-multimedia/alsa/alsa-lib_1.1.6.bb +6 -7
@@ -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"
Signature · 1 line
2.17.1