Patchwork [v2] alsa-lib: fix packaging error

login
register
mail settings
Submitter Steffen Sledz
Date Jan. 11, 2011, 7:26 p.m.
Message ID <1294774001-29322-1-git-send-email-sledz@dresearch.de>
Download mbox | patch
Permalink /patch/230/
State Accepted
Headers show

Comments

Koen Kooi - Jan. 11, 2011, 1:39 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11-01-11 20:26, Steffen Sledz wrote:
> * symlink libasound.so -> libasound.so.2.0.0 in /usr/lib was missing in
>   dev package
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch.de>

Acked-by: Koen Kooi <koen@openembedded.org>

> ---
>  recipes/alsa/alsa-lib_1.0.20.bb |    2 +-
>  recipes/alsa/alsa-lib_1.0.23.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb
> index de522c7..fc508ec 100644
> --- a/recipes/alsa/alsa-lib_1.0.20.bb
> +++ b/recipes/alsa/alsa-lib_1.0.20.bb
> @@ -34,7 +34,7 @@ FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
>  FILES_libasound = "${libdir}/libasound.so.*"
>  FILES_alsa-server = "${bindir}/*"
>  FILES_alsa-conf = "${datadir}/alsa/"
> -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
> +FILES_alsa-dev += "${libdir}/libasound.so ${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
>  FILES_alsa-conf-base = "\
>  ${datadir}/alsa/alsa.conf \
>  ${datadir}/alsa/cards/aliases.conf \
> diff --git a/recipes/alsa/alsa-lib_1.0.23.bb b/recipes/alsa/alsa-lib_1.0.23.bb
> index 0f9b14c..0085047 100644
> --- a/recipes/alsa/alsa-lib_1.0.23.bb
> +++ b/recipes/alsa/alsa-lib_1.0.23.bb
> @@ -36,7 +36,7 @@ FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
>  FILES_libasound = "${libdir}/libasound.so.*"
>  FILES_alsa-server = "${bindir}/*"
>  FILES_alsa-conf = "${datadir}/alsa/"
> -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
> +FILES_alsa-dev += "${libdir}/libasound.so ${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
>  FILES_alsa-conf-base = "\
>  ${datadir}/alsa/alsa.conf \
>  ${datadir}/alsa/cards/aliases.conf \

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNLF2RMkyGM64RGpERAv8DAJ9ipAyHrIazFiPN/+GdTRzaIWYMSgCeIUFx
Q0W7A2UtNVuNrVFkUwdht9g=
=1noC
-----END PGP SIGNATURE-----
Paul Menzel - Jan. 11, 2011, 2:24 p.m.
Am Dienstag, den 11.01.2011, 14:26 -0500 schrieb Steffen Sledz:

Your clock/time is incorrect.


Thanks,

Paul
Phil Blundell - Jan. 11, 2011, 2:36 p.m.
On Tue, 2011-01-11 at 14:26 -0500, Steffen Sledz wrote:
> * symlink libasound.so -> libasound.so.2.0.0 in /usr/lib was missing in
>   dev package

Why doesn't the generic FILES_${PN}-dev from bitbake.conf catch this
file?  Not that I think your patch is necessarily wrong but it isn't
obvious to me why it is necessary.

p.
Steffen Sledz - Jan. 11, 2011, 2:57 p.m.
Am 11.01.2011 15:36, schrieb Phil Blundell:
> On Tue, 2011-01-11 at 14:26 -0500, Steffen Sledz wrote:
>> * symlink libasound.so -> libasound.so.2.0.0 in /usr/lib was missing in
>>   dev package
> 
> Why doesn't the generic FILES_${PN}-dev from bitbake.conf catch this
> file?  Not that I think your patch is necessarily wrong but it isn't
> obvious to me why it is necessary.

The ALSA package structure seems to be a bit complex. There is an additional package named libasound but no libasound-dev. The development stuff is summed up in alsa-lib-dev.

BTW: I'm not an ALSA maintainer. Just tumbled over the missing symlink.

Steffen
Steffen Sledz - Jan. 11, 2011, 2:58 p.m.
Am 11.01.2011 15:24, schrieb Paul Menzel:
> Am Dienstag, den 11.01.2011, 14:26 -0500 schrieb Steffen Sledz:
> 
> Your clock/time is incorrect.

Arrgghh.

Should be fixed now.

Steffen
Steffen Sledz - Jan. 11, 2011, 7:26 p.m.
* symlink libasound.so -> libasound.so.2.0.0 in /usr/lib was missing in
  dev package

Signed-off-by: Steffen Sledz <sledz@dresearch.de>
---
 recipes/alsa/alsa-lib_1.0.20.bb |    2 +-
 recipes/alsa/alsa-lib_1.0.23.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Khem Raj - Jan. 12, 2011, 7:46 a.m.
On 1/11/2011 11:26 AM, Steffen Sledz wrote:
> * symlink libasound.so ->  libasound.so.2.0.0 in /usr/lib was missing in
>    dev package
>
> Signed-off-by: Steffen Sledz<sledz@dresearch.de>

Acked-by: Khem Raj <raj.khem@gmail.com>


> ---
>   recipes/alsa/alsa-lib_1.0.20.bb |    2 +-
>   recipes/alsa/alsa-lib_1.0.23.bb |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb
> index de522c7..fc508ec 100644
> --- a/recipes/alsa/alsa-lib_1.0.20.bb
> +++ b/recipes/alsa/alsa-lib_1.0.20.bb
> @@ -34,7 +34,7 @@ FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
>   FILES_libasound = "${libdir}/libasound.so.*"
>   FILES_alsa-server = "${bindir}/*"
>   FILES_alsa-conf = "${datadir}/alsa/"
> -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
> +FILES_alsa-dev += "${libdir}/libasound.so ${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
>   FILES_alsa-conf-base = "\
>   ${datadir}/alsa/alsa.conf \
>   ${datadir}/alsa/cards/aliases.conf \
> diff --git a/recipes/alsa/alsa-lib_1.0.23.bb b/recipes/alsa/alsa-lib_1.0.23.bb
> index 0f9b14c..0085047 100644
> --- a/recipes/alsa/alsa-lib_1.0.23.bb
> +++ b/recipes/alsa/alsa-lib_1.0.23.bb
> @@ -36,7 +36,7 @@ FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
>   FILES_libasound = "${libdir}/libasound.so.*"
>   FILES_alsa-server = "${bindir}/*"
>   FILES_alsa-conf = "${datadir}/alsa/"
> -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
> +FILES_alsa-dev += "${libdir}/libasound.so ${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
>   FILES_alsa-conf-base = "\
>   ${datadir}/alsa/alsa.conf \
>   ${datadir}/alsa/cards/aliases.conf \

Patch

diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb
index de522c7..fc508ec 100644
--- a/recipes/alsa/alsa-lib_1.0.20.bb
+++ b/recipes/alsa/alsa-lib_1.0.20.bb
@@ -34,7 +34,7 @@  FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
 FILES_libasound = "${libdir}/libasound.so.*"
 FILES_alsa-server = "${bindir}/*"
 FILES_alsa-conf = "${datadir}/alsa/"
-FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-dev += "${libdir}/libasound.so ${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
 FILES_alsa-conf-base = "\
 ${datadir}/alsa/alsa.conf \
 ${datadir}/alsa/cards/aliases.conf \
diff --git a/recipes/alsa/alsa-lib_1.0.23.bb b/recipes/alsa/alsa-lib_1.0.23.bb
index 0f9b14c..0085047 100644
--- a/recipes/alsa/alsa-lib_1.0.23.bb
+++ b/recipes/alsa/alsa-lib_1.0.23.bb
@@ -36,7 +36,7 @@  FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
 FILES_libasound = "${libdir}/libasound.so.*"
 FILES_alsa-server = "${bindir}/*"
 FILES_alsa-conf = "${datadir}/alsa/"
-FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-dev += "${libdir}/libasound.so ${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
 FILES_alsa-conf-base = "\
 ${datadir}/alsa/alsa.conf \
 ${datadir}/alsa/cards/aliases.conf \