From 9b6a548f5a0b06c39d9287ec7f32236d19405819 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 14 Nov 2011 11:39:49 +0100 Subject: alsa-lib: use PKGSUFFIX for every package to resolve multiple runtime providers from target and nativesdk (From OE-Core rev: 60738953f6fee24de447cd0f9cf81cce6f8966a5) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb index b787c54caf..7f643b737e 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb @@ -14,7 +14,7 @@ BBCLASSEXTEND = "native" #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ file://fix-tstamp-declaration.patch" @@ -31,17 +31,20 @@ EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " -PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +PKGSUFFIX = "" +PKGSUFFIX_virtclass-nativesdk = "-nativesdk" + +PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}" 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-conf-base = "\ +FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*" +FILES_alsa-server${PKGSUFFIX} = "${bindir}/*" +FILES_alsa-conf${PKGSUFFIX} = "${datadir}/alsa/" +FILES_alsa-dev${PKGSUFFIX} += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base${PKGSUFFIX} = "\ ${datadir}/alsa/alsa.conf \ ${datadir}/alsa/cards/aliases.conf \ ${datadir}/alsa/pcm/default.conf \ ${datadir}/alsa/pcm/dmix.conf \ ${datadir}/alsa/pcm/dsnoop.conf" -RDEPENDS_libasound = "alsa-conf-base" +RDEPENDS_libasound${PKGSUFFIX} = "alsa-conf-base${PKGSUFFIX}" -- cgit v1.2.3-54-g00ecf