Patchwork pimlico: remove Poky overrides

login
register
mail settings
Submitter Ross Burton
Date Aug. 29, 2012, 1:32 p.m.
Message ID <1346247150-17236-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/35487/
State Superseded
Headers show

Comments

Ross Burton - Aug. 29, 2012, 1:32 p.m.
---
 meta-gnome/recipes-gnome/pimlico/contacts.inc |    4 +---
 meta-gnome/recipes-gnome/pimlico/dates.inc    |    4 +---
 meta-gnome/recipes-gnome/pimlico/tasks.inc    |    2 --
 3 files changed, 2 insertions(+), 8 deletions(-)
Khem Raj - Aug. 29, 2012, 2:17 p.m.
A bit explanation as to why it's done will be nice. 
Why comment out instead delete  
Is this window menu patch needed somewhere else
If not it must go as well 

On Aug 29, 2012, at 6:32 AM, Ross Burton <ross.burton@intel.com> wrote:

> ---
> meta-gnome/recipes-gnome/pimlico/contacts.inc |    4 +---
> meta-gnome/recipes-gnome/pimlico/dates.inc    |    4 +---
> meta-gnome/recipes-gnome/pimlico/tasks.inc    |    2 --
> 3 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc
> index 9798985..04de63c 100644
> --- a/meta-gnome/recipes-gnome/pimlico/contacts.inc
> +++ b/meta-gnome/recipes-gnome/pimlico/contacts.inc
> @@ -5,13 +5,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
> LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
> SECTION = "x11"
> DEPENDS = "glib-2.0 gtk+ evolution-data-server"
> -DEPENDS_append_poky = " libowl"
> RDEPENDS_${PN} = "libedata-book"
> 
> inherit autotools pkgconfig
> 
> OWL = "--disable-owl"
> -OWL_poky = "--enable-owl"
> 
> EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
> EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
> @@ -31,4 +29,4 @@ SRC_URI = "file://stock_contact.png \
>            file://contacts-conditionally-install-schema.patch \
>           "
> 
> -SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
> +#SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
> diff --git a/meta-gnome/recipes-gnome/pimlico/dates.inc b/meta-gnome/recipes-gnome/pimlico/dates.inc
> index 9b338fd..3c4a048 100644
> --- a/meta-gnome/recipes-gnome/pimlico/dates.inc
> +++ b/meta-gnome/recipes-gnome/pimlico/dates.inc
> @@ -12,9 +12,7 @@ inherit autotools gettext pkgconfig gtk-icon-cache
> 
> # Poky/Sato specific enhancements
> OWL = "--disable-owl"
> -OWL_poky = "--enable-owl --disable-dnd"
> 
> EXTRA_OECONF += "${OWL}"
> -DEPENDS_append_poky = " libowl"
> -SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
> +#SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
> 
> diff --git a/meta-gnome/recipes-gnome/pimlico/tasks.inc b/meta-gnome/recipes-gnome/pimlico/tasks.inc
> index 9cd5259..a952153 100644
> --- a/meta-gnome/recipes-gnome/pimlico/tasks.inc
> +++ b/meta-gnome/recipes-gnome/pimlico/tasks.inc
> @@ -6,11 +6,9 @@ LICENSE = "GPLv2 & GPLv2+"
> 
> SECTION = "x11"
> DEPENDS = "glib-2.0 gtk+ evolution-data-server"
> -DEPENDS_append_poky = " libowl"
> 
> inherit autotools pkgconfig gtk-icon-cache
> 
> OWL ?= "--disable-owl"
> -OWL_poky ?= "--enable-owl"
> 
> EXTRA_OECONF += "${OWL}"
> -- 
> 1.7.10
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Ross Burton - Aug. 29, 2012, 3:31 p.m.
On 29 August 2012 15:17, Khem Raj <raj.khem@gmail.com> wrote:
> A bit explanation as to why it's done will be nice.
> Why comment out instead delete
> Is this window menu patch needed somewhere else
> If not it must go as well

Thinking about it, I'd like to retract this patch and leave the Poky
distro overrides in that file.  If someone wants dates/contacts/tasks
on Poky then they'll get the extra integration, and it serves as an
example/reminder of the functionality it brings (makes the menu bar a
dropdown from the window title).

Ross
Koen Kooi - Aug. 29, 2012, 4:53 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 29-08-12 17:31, Burton, Ross schreef:
> On 29 August 2012 15:17, Khem Raj <raj.khem@gmail.com> wrote:
>> A bit explanation as to why it's done will be nice. Why comment out
>> instead delete Is this window menu patch needed somewhere else If not
>> it must go as well
> 
> Thinking about it, I'd like to retract this patch and leave the Poky 
> distro overrides in that file.  If someone wants dates/contacts/tasks on
> Poky then they'll get the extra integration, and it serves as an 
> example/reminder of the functionality it brings (makes the menu bar a 
> dropdown from the window title).

Either take the distro stuff out or take the recipes out. Meta-openembedded
is supposed to be a shining example of layer correctness.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQPkjwMkyGM64RGpERAsu9AJ92ZNXlSRYyHdWkXRbOdr/STaFdawCgo6+T
7n5Du6jUwDYmd0JvJs9o+7s=
=losa
-----END PGP SIGNATURE-----
Ross Burton - Aug. 29, 2012, 4:59 p.m.
On 29 August 2012 17:53, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Either take the distro stuff out or take the recipes out. Meta-openembedded
> is supposed to be a shining example of layer correctness.

I don't particularly want to maintain bbappends in meta-yocto for
these as I'd prefer to see the recipes (well, contacts and dates, I
still "maintain" tasks) gone.

Ross
Paul Eggleton - Aug. 29, 2012, 5:03 p.m.
On Wednesday 29 August 2012 17:59:06 Burton, Ross wrote:
> On 29 August 2012 17:53, Koen Kooi <koen@dominion.thruhere.net> wrote:
> > Either take the distro stuff out or take the recipes out.
> > Meta-openembedded
> > is supposed to be a shining example of layer correctness.
> 
> I don't particularly want to maintain bbappends in meta-yocto for
> these as I'd prefer to see the recipes (well, contacts and dates, I
> still "maintain" tasks) gone.

The ideal option would be to turn these into PACKAGECONFIG options and then 
they can be set from anyone's distro config as desired (using pn- overrides) - 
no bbappends needed.

Cheers,
Paul
Khem Raj - Aug. 29, 2012, 5:34 p.m.
On Wed, Aug 29, 2012 at 8:31 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> Thinking about it, I'd like to retract this patch and leave the Poky
> distro overrides in that file.  If someone wants dates/contacts/tasks
> on Poky then they'll get the extra integration, and it serves as an
> example/reminder of the functionality it brings (makes the menu bar a
> dropdown from the window title).

Patch is fine.
it should go into meta-yocto which is integration layer for poky distro
so you patch to delete is fine. may be convert it to some sort of PACKAGECONFIG
which distros can use.
Ross Burton - Aug. 29, 2012, 7:22 p.m.
On 29 August 2012 18:34, Khem Raj <raj.khem@gmail.com> wrote:
> Patch is fine.
> it should go into meta-yocto which is integration layer for poky distro
> so you patch to delete is fine. may be convert it to some sort of PACKAGECONFIG
> which distros can use.

I don't want them in Poky. :)  I started by simply deleting them, but
Martin insisted that he still has users.  They are not using Poky, I
presume.

Ross
Martin Jansa - Aug. 29, 2012, 9:04 p.m.
On Wed, Aug 29, 2012 at 08:22:08PM +0100, Burton, Ross wrote:
> On 29 August 2012 18:34, Khem Raj <raj.khem@gmail.com> wrote:
> > Patch is fine.
> > it should go into meta-yocto which is integration layer for poky distro
> > so you patch to delete is fine. may be convert it to some sort of PACKAGECONFIG
> > which distros can use.
> 
> I don't want them in Poky. :)  I started by simply deleting them, but
> Martin insisted that he still has users.  They are not using Poky, I
> presume.

No, they are not using Poky, so I'm fine with removing all poky
overrides and poky-only patches from meta-oe.

Cheers,

Patch

diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc
index 9798985..04de63c 100644
--- a/meta-gnome/recipes-gnome/pimlico/contacts.inc
+++ b/meta-gnome/recipes-gnome/pimlico/contacts.inc
@@ -5,13 +5,11 @@  BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ evolution-data-server"
-DEPENDS_append_poky = " libowl"
 RDEPENDS_${PN} = "libedata-book"
 
 inherit autotools pkgconfig
 
 OWL = "--disable-owl"
-OWL_poky = "--enable-owl"
 
 EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
 EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
@@ -31,4 +29,4 @@  SRC_URI = "file://stock_contact.png \
            file://contacts-conditionally-install-schema.patch \
           "
 
-SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
+#SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
diff --git a/meta-gnome/recipes-gnome/pimlico/dates.inc b/meta-gnome/recipes-gnome/pimlico/dates.inc
index 9b338fd..3c4a048 100644
--- a/meta-gnome/recipes-gnome/pimlico/dates.inc
+++ b/meta-gnome/recipes-gnome/pimlico/dates.inc
@@ -12,9 +12,7 @@  inherit autotools gettext pkgconfig gtk-icon-cache
 
 # Poky/Sato specific enhancements
 OWL = "--disable-owl"
-OWL_poky = "--enable-owl --disable-dnd"
 
 EXTRA_OECONF += "${OWL}"
-DEPENDS_append_poky = " libowl"
-SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
+#SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
 
diff --git a/meta-gnome/recipes-gnome/pimlico/tasks.inc b/meta-gnome/recipes-gnome/pimlico/tasks.inc
index 9cd5259..a952153 100644
--- a/meta-gnome/recipes-gnome/pimlico/tasks.inc
+++ b/meta-gnome/recipes-gnome/pimlico/tasks.inc
@@ -6,11 +6,9 @@  LICENSE = "GPLv2 & GPLv2+"
 
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ evolution-data-server"
-DEPENDS_append_poky = " libowl"
 
 inherit autotools pkgconfig gtk-icon-cache
 
 OWL ?= "--disable-owl"
-OWL_poky ?= "--enable-owl"
 
 EXTRA_OECONF += "${OWL}"