Skip to contentSkip to conversation

default-providers: add alsa to resolve multiple runtime providers

PATCH In review Martin Jansa 3 participants 6 messages Nov 12, 2011 – Nov 15, 2011 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Martin Jansa

author
#1 lore raw

PATCH 1/1 default-providers: add alsa to resolve multiple runtime providers

Signed-off-by Martin Jansa <[email protected]>
---
 meta/conf/distro/include/default-providers.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/conf/distro/include/default-providers.inc +1 -0
index afea5e7..79785fb 100644
@@ -19,6 +19,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 #
 # Default recipe providers
 #
+PREFERRED_PROVIDER_alsa-lib ?= "alsa-lib"
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
 PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
 PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
Signature · 1 line
1.7.8.rc1
#2 lore raw
Quoted 10 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/conf/distro/include/default-providers.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/conf/distro/include/default-providers.inc +0 -0
index afea5e7..79785fb 100644

meta/conf/distro/include/default-providers.inc VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" · line 25

Quoted 7 lines
meta/conf/distro/include/default-providers.inc +1 -0
@@ -19,6 +19,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 #
 # Default recipe providers
 #
+PREFERRED_PROVIDER_alsa-lib ?= "alsa-lib"
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
 PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
 PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"

What else is providing "alsa-lib"? This sounds like a bug :/

Cheers,

Richard

#3 lore raw

Op 12 nov. 2011, om 09:03 heeft Richard Purdie het volgende geschreven:

Quoted 6 lines · Martin Jansa
Quoted 5 lines
Signed-off-by Martin Jansa <[email protected]>

---
meta/conf/distro/include/default-providers.inc | 1 +

1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 14 lines
Quoted 9 lines
meta/conf/distro/include/default-providers.inc +1 -0
index afea5e7..79785fb 100644
@@ -19,6 +19,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 #
 # Default recipe providers
 #
+PREFERRED_PROVIDER_alsa-lib ?= "alsa-lib"
Quoted 3 lines

PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"

What else is providing "alsa-lib"? This sounds like a bug :/

According to Sau!:

NOTE: Resolving any missing task queue dependencies
NOTE: multiple providers are available for runtime libasound (alsa-lib, alsa-lib-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match libasound
NOTE: multiple providers are available for runtime alsa-conf-base (alsa-lib, alsa-lib-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match alsa-conf-base

regards,

Koen

#4 lore raw
Quoted 23 lines · Koen Kooi

Op 12 nov. 2011, om 09:03 heeft Richard Purdie het volgende geschreven:

Quoted 6 lines · Martin Jansa
Quoted 5 lines
Signed-off-by Martin Jansa <[email protected]>

---
meta/conf/distro/include/default-providers.inc | 1 +

1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 14 lines
Quoted 9 lines
meta/conf/distro/include/default-providers.inc +1 -0
index afea5e7..79785fb 100644
@@ -19,6 +19,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 #
 # Default recipe providers
 #
+PREFERRED_PROVIDER_alsa-lib ?= "alsa-lib"
Quoted 3 lines

PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"

What else is providing "alsa-lib"? This sounds like a bug :/

Quoted 5 lines

According to Sau!:

NOTE: Resolving any missing task queue dependencies
NOTE: multiple providers are available for runtime libasound (alsa-lib, alsa-lib-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match libasound

Which is a bug. alsa-lib-nativesdk should provide libasound-nativesdk, not libasound.

Quoted 2 lines

NOTE: multiple providers are available for runtime alsa-conf-base (alsa-lib, alsa-lib-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match alsa-conf-base

ditto.

Lets fix the underlying bug please :)

Cheers,

Richard

author
#5 lore raw

PATCH 1/1 alsa-lib: use PKGSUFFIX for every package to resolve multiple runtime providers from target and nativesdk

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb +11 -8
index d701031..83e663d 100644
@@ -14,7 +14,7 @@ BBCLASSEXTEND = "native nativesdk"
 #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}"
Signature · 1 line
1.7.8.rc1
Applied
#6 lore raw

Re: [PATCH] alsa-lib: use PKGSUFFIX for every package to resolve multiple runtime providers from target and nativesdk

Quoted 4 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

Merged to master, thanks.

Richard