Patchwork pulseaudio: only package consolekit module when x11 is enabled

login
register
mail settings
Submitter Christopher Larson
Date Dec. 13, 2013, 2:47 p.m.
Message ID <1386946031-6292-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/63333/
State Accepted
Commit e230b4498790a3dfdc36ea5761807459fc96368e
Headers show

Comments

Christopher Larson - Dec. 13, 2013, 2:47 p.m.
As requested by Martin Jansa <martin.jansa@gmail.com>.

Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Martin Jansa - Dec. 15, 2013, 6:03 p.m.
On Fri, Dec 13, 2013 at 07:47:11AM -0700, Christopher Larson wrote:
> As requested by Martin Jansa <martin.jansa@gmail.com>.

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

> 
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> ---
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 2bee9eb..dce8555 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -74,7 +74,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
>  # 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-module-console-kit"
> +             pulseaudio-server pulseaudio-misc ${@base_contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}"
>  
>  #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

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2bee9eb..dce8555 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -74,7 +74,7 @@  USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
 # 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-module-console-kit"
+             pulseaudio-server pulseaudio-misc ${@base_contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}"
 
 #upgrade path:
 RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"