Patchwork [1/4] pulseaudio: add GConf dependency

login
register
mail settings
Submitter Ross Burton
Date Oct. 24, 2012, 4:37 p.m.
Message ID <1351096656-32438-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/38531/
State Accepted
Commit 558705735aa9a2d640d1114bd809ca4ea7f0130d
Headers show

Comments

Ross Burton - Oct. 24, 2012, 4:37 p.m.
Add explicit build-dependency on GConf as currently it's an implicit dependency
and so vunerable to races at build time.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc    |    2 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - Oct. 24, 2012, 6:09 p.m.
On Wed, Oct 24, 2012 at 05:37:33PM +0100, Ross Burton wrote:
> Add explicit build-dependency on GConf as currently it's an implicit dependency
> and so vunerable to races at build time.

Isn't better to inherit gconf or the issue I had today with foxtrotgps
does not apply here?

> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc    |    2 +-
>  meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 463777d..ab70c7e 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
>  DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
>             ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
>  # optional
> -DEPENDS += "udev alsa-lib glib-2.0 dbus \
> +DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \
>             ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
>  
>  SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> index a10b953..d25b424 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> @@ -1,6 +1,6 @@
>  require pulseaudio.inc
>  
> -PR = "r7"
> +PR = "r8"
>  
>  DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
>  
> -- 
> 1.7.10
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Ross Burton - Oct. 24, 2012, 7:30 p.m.
On 24 October 2012 19:09, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Oct 24, 2012 at 05:37:33PM +0100, Ross Burton wrote:
>> Add explicit build-dependency on GConf as currently it's an implicit dependency
>> and so vunerable to races at build time.
>
> Isn't better to inherit gconf or the issue I had today with foxtrotgps
> does not apply here?

This just links to gconf, no schemas.

Ross
Saul Wold - Oct. 28, 2012, 1:17 a.m.
On 10/24/2012 09:37 AM, Ross Burton wrote:
> Add explicit build-dependency on GConf as currently it's an implicit dependency
> and so vunerable to races at build time.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-multimedia/pulseaudio/pulseaudio.inc    |    2 +-
>   meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 463777d..ab70c7e 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
>   DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
>              ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
>   # optional
> -DEPENDS += "udev alsa-lib glib-2.0 dbus \
> +DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \
>              ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
>
>   SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> index a10b953..d25b424 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> @@ -1,6 +1,6 @@
>   require pulseaudio.inc
>
> -PR = "r7"
> +PR = "r8"
>
>   DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
>
>

Merged this full set to OE-Core

Thanks
	Sau!
Andrei Gherzan - Oct. 30, 2012, 9:59 a.m.
This commit made pulseaudio unbuildable for builds with no GPLv3 packages.

Andrei


On Wed, Oct 24, 2012 at 7:37 PM, Ross Burton <ross.burton@intel.com> wrote:

> Add explicit build-dependency on GConf as currently it's an implicit
> dependency
> and so vunerable to races at build time.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc    |    2 +-
>  meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 463777d..ab70c7e 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =
> "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
>  DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool
> \
>             ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11
> libxtst libice libsm libxcb gtk+', '', d)}"
>  # optional
> -DEPENDS += "udev alsa-lib glib-2.0 dbus \
> +DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \
>             ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '',
> d)}"
>
>  SRC_URI = "
> http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bbb/meta/recipes-multimedia/pulseaudio/
> pulseaudio_2.1.bb
> index a10b953..d25b424 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
> @@ -1,6 +1,6 @@
>  require pulseaudio.inc
>
> -PR = "r7"
> +PR = "r8"
>
>  DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
>
> --
> 1.7.10
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Ross Burton - Oct. 30, 2012, 10:02 a.m.
On 30 October 2012 09:59, Andrei Gherzan <andrei@gherzan.ro> wrote:
> This commit made pulseaudio unbuildable for builds with no GPLv3 packages.

What causes gconf to not build without GPLv3?

Ross
Andrei Gherzan - Oct. 30, 2012, 10:10 a.m.
On Tue, Oct 30, 2012 at 12:02 PM, Burton, Ross <ross.burton@intel.com>wrote:

> On 30 October 2012 09:59, Andrei Gherzan <andrei@gherzan.ro> wrote:
> > This commit made pulseaudio unbuildable for builds with no GPLv3
> packages.
>
> What causes gconf to not build without GPLv3?
>

pulseaudio depends on gconf (because of that racing issues). Now, gconf
inherits gnomebase which adds to gconf's DEPENDS gnome-common package which
is GPLv3. So this is the chain.

ag
Ross Burton - Oct. 30, 2012, 10:19 a.m.
On 30 October 2012 10:10, Andrei Gherzan <andrei@gherzan.ro> wrote:
>> What causes gconf to not build without GPLv3?
>
> pulseaudio depends on gconf (because of that racing issues). Now, gconf
> inherits gnomebase which adds to gconf's DEPENDS gnome-common package which
> is GPLv3. So this is the chain.

Oh joy, one of those instances where GPLv3 isn't actually a problem.

gnome-common is some scripts and tools used at configure time, so
there isn't any linkage, so there isn't any GPLv3 in the images, so
there isn't a problem.

The question is how do we express this?

Ross
Andrei Gherzan - Oct. 30, 2012, 10:31 a.m.
On Tue, Oct 30, 2012 at 12:19 PM, Burton, Ross <ross.burton@intel.com>wrote:

> On 30 October 2012 10:10, Andrei Gherzan <andrei@gherzan.ro> wrote:
> >> What causes gconf to not build without GPLv3?
> >
> > pulseaudio depends on gconf (because of that racing issues). Now, gconf
> > inherits gnomebase which adds to gconf's DEPENDS gnome-common package
> which
> > is GPLv3. So this is the chain.
>
> Oh joy, one of those instances where GPLv3 isn't actually a problem.
>
> gnome-common is some scripts and tools used at configure time, so
> there isn't any linkage, so there isn't any GPLv3 in the images, so
> there isn't a problem.
>
> The question is how do we express this?
>
>
Should it be whitelisted?
ag
Tomas Frydrych - Oct. 30, 2012, 10:44 a.m.
On 30/10/12 10:31, Andrei Gherzan wrote:
>> gnome-common is some scripts and tools used at configure time, so
>> there isn't any linkage, so there isn't any GPLv3 in the images, so
>> there isn't a problem.
>>
>> The question is how do we express this?
>>
>>
> Should it be whitelisted?

The problem with whitelisting is that if the usage changes from the
assumptions the whitelisting was originally made on, this will not
automatically remove the whitelisting -- if whitlisting is the solution
here, it needs to be left to the Yocto users to do it locally based on
their own review of the situation.

I think to handle this scenario properly, you would need two sets of
license controls, one for 'build tools' and one for 'things that ship'.

Tomas

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 463777d..ab70c7e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -10,7 +10,7 @@  LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
 DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
            ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
 # optional
-DEPENDS += "udev alsa-lib glib-2.0 dbus \
+DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \
            ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index a10b953..d25b424 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@ 
 require pulseaudio.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"