Patchwork [7/7] pulseaudio: fix RDEPENDS traversal for consolekit

login
register
mail settings
Submitter Christopher Larson
Date Nov. 27, 2013, 6:07 p.m.
Message ID <c39555e418cf1bbb70e06dbe905411a864727e42.1385575572.git.kergoth@gmail.com>
Download mbox | patch
Permalink /patch/62515/
State New
Headers show

Comments

Christopher Larson - Nov. 27, 2013, 6:07 p.m.
From: Christopher Larson <chris_larson@mentor.com>

Include the console-kit module in PACKSGES explicitly so bitbake can map to
the RDEPENDS we define for it in this recipe, and thereby ensure that when
adding the console-kit module to an image, we also get the necessary
consolekit package produced.

Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Martin Jansa - Dec. 11, 2013, 9:22 p.m.
On Wed, Nov 27, 2013 at 11:07:07AM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
> 
> Include the console-kit module in PACKSGES explicitly so bitbake can map to
> the RDEPENDS we define for it in this recipe, and thereby ensure that when
> adding the console-kit module to an image, we also get the necessary
> consolekit package produced.
> 
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> ---
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 7e87ef8..2bee9eb 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -69,8 +69,12 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
>                                --no-create-home --shell /bin/false \
>                                --groups audio,pulse --gid pulse pulse"
>  
> +# The console-kit module is included here explicitly so bitbake can map to the
> +# RDEPENDS we define for it in this recipe, and thereby ensure that when
> +# adding the console-kit module to an image, we also get the necessary
> +# consolekit package produced.
>  PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \
> -             pulseaudio-server pulseaudio-misc"
> +             pulseaudio-server pulseaudio-misc pulseaudio-module-console-kit"

Can we add PACKAGECONFIG for this and add it to PACKAGES only
conditionally?

It causes hard dependency on consolekit -> libx11 so pulseaudio now
cannot be built for distros without x11 DISTRO_FEATURE.

>  #upgrade path:
>  RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
> -- 
> 1.8.3.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Christopher Larson - Dec. 12, 2013, 10:55 p.m.
On Wed, Dec 11, 2013 at 2:22 PM, Martin Jansa <martin.jansa@gmail.com>wrote:

> On Wed, Nov 27, 2013 at 11:07:07AM -0700, Christopher Larson wrote:
> > From: Christopher Larson <chris_larson@mentor.com>
> >
> > Include the console-kit module in PACKSGES explicitly so bitbake can map
> to
> > the RDEPENDS we define for it in this recipe, and thereby ensure that
> when
> > adding the console-kit module to an image, we also get the necessary
> > consolekit package produced.
> >
> > Signed-off-by: Christopher Larson <kergoth@gmail.com>
> > ---
> >  meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> > index 7e87ef8..2bee9eb 100644
> > --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> > +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> > @@ -69,8 +69,12 @@ USERADD_PARAM_pulseaudio-server = "--system --home
> /var/run/pulse \
> >                                --no-create-home --shell /bin/false \
> >                                --groups audio,pulse --gid pulse pulse"
> >
> > +# The console-kit module is included here explicitly so bitbake can map
> to the
> > +# RDEPENDS we define for it in this recipe, and thereby ensure that when
> > +# adding the console-kit module to an image, we also get the necessary
> > +# consolekit package produced.
> >  PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple
> libpulse-mainloop-glib \
> > -             pulseaudio-server pulseaudio-misc"
> > +             pulseaudio-server pulseaudio-misc
> pulseaudio-module-console-kit"
>
> Can we add PACKAGECONFIG for this and add it to PACKAGES only
> conditionally?
>
> It causes hard dependency on consolekit -> libx11 so pulseaudio now
> cannot be built for distros without x11 DISTRO_FEATURE.


Sorry about this, I’ll send a patch shortly.

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 7e87ef8..2bee9eb 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -69,8 +69,12 @@  USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
                               --no-create-home --shell /bin/false \
                               --groups audio,pulse --gid pulse pulse"
 
+# The console-kit module is included here explicitly so bitbake can map to the
+# RDEPENDS we define for it in this recipe, and thereby ensure that when
+# adding the console-kit module to an image, we also get the necessary
+# consolekit package produced.
 PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \
-             pulseaudio-server pulseaudio-misc"
+             pulseaudio-server pulseaudio-misc pulseaudio-module-console-kit"
 
 #upgrade path:
 RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"