[oe-core][RFC][PATCH 1/3] gcr: blacklist because of conflict with gnome-keyring

[oe-core][RFC][PATCH 1/3] gcr: blacklist because of conflict with gnome-keyring

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
index f30fcf1..1a70ac0 100644
--- a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
+++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
@@ -7,6 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt"
 
+PNBLACKLIST[gcr] = "CONFLICT: 4 files conflict with gnome-keyring"
+# e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
+#      sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert
+
 inherit autotools gnomebase gtk-icon-cache gtk-doc
 
 GNOME_COMPRESS_TYPE="xz"
-- 
2.1.1

[oe-core][RFC][PATCH 2/3] gnome-panel3, gnome-menus3, libgweather3: blacklist because of sysroot conflicts with 2* versions

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb | 3 +++
 meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb  | 2 ++
 meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb     | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
index 87060f3..38ea5e5 100644
--- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
+PNBLACKLIST[gnome-menus3] = "CONFLICT: 24 files are conflicting with gnome-menus"
+# e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory
+
 DEPENDS = "python libxml2 gconf popt gtk+3"
 
 inherit gnomebase pkgconfig python-dir pythonnative
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
index 8802dba..f89f3da 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
@@ -4,6 +4,8 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
 BPN = "gnome-panel"
 PR = "r1"
 
+PNBLACKLIST[gnome-panel3] = "CONFLICT: depends on libgweather3 which conflicts with libgweather"
+
 # conflicts with gnome-panel, because they provide the same package
 # http://patches.openembedded.org/patch/43105/
 EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
index 5d6467f..69cdd8f 100644
--- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
@@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SECTION = "x11/gnome/libs"
 DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3"
 
+PNBLACKLIST[libgweather3] = "CONFLICT: 876 files are conflicting with libgweather"
+# e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd
+#      sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml
+
 BPN = "libgweather"
 
 inherit gnome
-- 
2.1.1

[oe-core][RFC][PATCH 3/3] modphp: blacklist because of conflict with php

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-webserver/recipes-php/modphp/modphp5.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 6932429..8707950 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -14,6 +14,9 @@ S = "${WORKDIR}/php-${PV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
 
+PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
+# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
+
 inherit autotools
 
 CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
-- 
2.1.1

Re: [oe-core][RFC][PATCH 3/3] modphp: blacklist because of conflict with php

[Martin Jansa]

This one should blacklist xdebug as well, because xdebug depends on modphp.

On Mon, Oct 6, 2014 at 6:12 PM, Martin Jansa <martin.jansa@gmail.com> wrote:

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-webserver/recipes-php/modphp/modphp5.inc | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc
> b/meta-webserver/recipes-php/modphp/modphp5.inc
> index 6932429..8707950 100644
> --- a/meta-webserver/recipes-php/modphp/modphp5.inc
> +++ b/meta-webserver/recipes-php/modphp/modphp5.inc
> @@ -14,6 +14,9 @@ S = "${WORKDIR}/php-${PV}"
>
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
>
> +PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
> +# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
> +
>  inherit autotools
>
>  CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED
> -I${STAGING_INCDIR}/apache2"
> --
> 2.1.1
>
>

[meta-oe][PATCHv2] modphp, xdebug: blacklist because of conflict with php

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-webserver/recipes-php/modphp/modphp5.inc     | 3 +++
 meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 1 +
 2 files changed, 4 insertions(+)

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 6932429..8707950 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -14,6 +14,9 @@ S = "${WORKDIR}/php-${PV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
 
+PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
+# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
+
 inherit autotools
 
 CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
index ffff135..750b288 100644
--- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
+++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16"
 
 DEPENDS = "modphp"
 
+PNBLACKLIST[xdebug] = "CONFLICT: depends on blocked modphp"
 
 SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz"
 
-- 
2.1.1

Re: [meta-oe][PATCHv2] modphp, xdebug: blacklist because of conflict with php

[Paul Eggleton]

On Tuesday 07 October 2014 06:53:17 Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-webserver/recipes-php/modphp/modphp5.inc     | 3 +++
>  meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 1 +
>  2 files changed, 4 insertions(+)
> 
> diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc
> b/meta-webserver/recipes-php/modphp/modphp5.inc index 6932429..8707950
> 100644
> --- a/meta-webserver/recipes-php/modphp/modphp5.inc
> +++ b/meta-webserver/recipes-php/modphp/modphp5.inc
> @@ -14,6 +14,9 @@ S = "${WORKDIR}/php-${PV}"
> 
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
> 
> +PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
> +# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
> +

I'm sorry, but we are not going to blacklist this recipe for everyone. I 
appreciate that stricter tests mean these can't be built side-by-side, that's 
just unfortunate and something we will have to live with for now.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-oe][PATCHv2] modphp, xdebug: blacklist because of conflict with php

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2780 bytes --]

On Tue, Oct 07, 2014 at 09:39:34AM +0100, Paul Eggleton wrote:
> On Tuesday 07 October 2014 06:53:17 Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta-webserver/recipes-php/modphp/modphp5.inc     | 3 +++
> >  meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 1 +
> >  2 files changed, 4 insertions(+)
> > 
> > diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc
> > b/meta-webserver/recipes-php/modphp/modphp5.inc index 6932429..8707950
> > 100644
> > --- a/meta-webserver/recipes-php/modphp/modphp5.inc
> > +++ b/meta-webserver/recipes-php/modphp/modphp5.inc
> > @@ -14,6 +14,9 @@ S = "${WORKDIR}/php-${PV}"
> > 
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
> > 
> > +PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
> > +# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
> > +
> 
> I'm sorry, but we are not going to blacklist this recipe for everyone. I 
> appreciate that stricter tests mean these can't be built side-by-side, that's 
> just unfortunate and something we will have to live with for now.

It was motivated by discussion with RP and Ross on #yocto.

23:52:26 < JaMa|Off> RP: would it make sense to change populate-sysroot conflicts to use package_qa_handle_error function so it would be fatal QA error (by default) with option to disable it?
23:53:31 < JaMa|Off> RP: I think part of this problem was that normal bb.warn messages are less visible than QA messages (which are also collected in qa.log) so easy to check after the build
23:55:49 < RP> JaMa|Off: To be honest, I don't want people to turn that on off. The issues are too nasty
23:56:42 < RP> s/on/one/
23:56:46 < JaMa|Off> OK, fair enough, I agree it's nasty
23:57:32 < JaMa|Off> it's last 6 failures in world builds (after including all my pending fixes), I've sent the list earlier today
23:57:45 < RP> JaMa|Off: if it stops there and then, the issue can usually be recovered. If you continue past that you no longer know what in the sysroot is corrupted
23:58:47 < JaMa|Off> the problem is that if I go with PNBLACKLIST (to blacklist one from the conflicting duo) then I'm blacklisting something which alone is fine (unless you're building the other 
                     recipe as well)
23:59:41 < JaMa|Off> e.g. Paul won't be happy if I blacklist modphp, just because it conflicts with php and vice-versa
00:20:27 < rburton> JaMa|Off: blacklisting both php and modphp is clearly the answer, and improves the world
00:22:43 < JaMa|Off> should I send patch for oe-core to blacklist xz and lzma as well? :)

You can still disable that PNBLACKLIST in your local.conf or distro.conf.
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-oe][PATCHv2] modphp, xdebug: blacklist because of conflict with php

[Paul Eggleton]

On Tuesday 07 October 2014 17:25:08 Martin Jansa wrote:
> On Tue, Oct 07, 2014 at 09:39:34AM +0100, Paul Eggleton wrote:
> > On Tuesday 07 October 2014 06:53:17 Martin Jansa wrote:
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > > 
> > >  meta-webserver/recipes-php/modphp/modphp5.inc     | 3 +++
> > >  meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 1 +
> > >  2 files changed, 4 insertions(+)
> > > 
> > > diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc
> > > b/meta-webserver/recipes-php/modphp/modphp5.inc index 6932429..8707950
> > > 100644
> > > --- a/meta-webserver/recipes-php/modphp/modphp5.inc
> > > +++ b/meta-webserver/recipes-php/modphp/modphp5.inc
> > > @@ -14,6 +14,9 @@ S = "${WORKDIR}/php-${PV}"
> > > 
> > >  LIC_FILES_CHKSUM =
> > >  "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
> > > 
> > > +PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
> > > +# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
> > > +
> > 
> > I'm sorry, but we are not going to blacklist this recipe for everyone. I
> > appreciate that stricter tests mean these can't be built side-by-side,
> > that's just unfortunate and something we will have to live with for now.
> 
> It was motivated by discussion with RP and Ross on #yocto.
> 
> 23:52:26 < JaMa|Off> RP: would it make sense to change populate-sysroot
> conflicts to use package_qa_handle_error function so it would be fatal QA
> error (by default) with option to disable it? 23:53:31 < JaMa|Off> RP: I
> think part of this problem was that normal bb.warn messages are less
> visible than QA messages (which are also collected in qa.log) so easy to
> check after the build 23:55:49 < RP> JaMa|Off: To be honest, I don't want
> people to turn that on off. The issues are too nasty 23:56:42 < RP>
> s/on/one/
> 23:56:46 < JaMa|Off> OK, fair enough, I agree it's nasty
> 23:57:32 < JaMa|Off> it's last 6 failures in world builds (after including
> all my pending fixes), I've sent the list earlier today 23:57:45 < RP>
> JaMa|Off: if it stops there and then, the issue can usually be recovered.
> If you continue past that you no longer know what in the sysroot is
> corrupted 23:58:47 < JaMa|Off> the problem is that if I go with PNBLACKLIST
> (to blacklist one from the conflicting duo) then I'm blacklisting something
> which alone is fine (unless you're building the other recipe as well)
> 23:59:41 < JaMa|Off> e.g. Paul won't be happy if I blacklist modphp, just
> because it conflicts with php and vice-versa 00:20:27 < rburton> JaMa|Off:
> blacklisting both php and modphp is clearly the answer, and improves the
> world 00:22:43 < JaMa|Off> should I send patch for oe-core to blacklist xz
> and lzma as well? :)
> 
> You can still disable that PNBLACKLIST in your local.conf or distro.conf.

Yes, I am aware of that. I just don't accept that this is the right way to 
handle this. Unlike other recipes we have blacklisted, there's nothing 
inherently wrong with the modphp recipe on its own, particularly considering 
that most users that wish to build it will have no interest in building it 
side-by-side with the separate php recipe.

The overlap will be fixed in due course. Until that time, can I ask that if you 
wish to blacklist this one for the sake of avoiding world build failures that 
you do it in your distro config?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre