Patchwork [oe,1/3] latencytop: disable GTK and remove gtk+ dependacy

login
register
mail settings
Submitter ml@communistcode.co.uk
Date Oct. 26, 2012, 11:54 a.m.
Message ID <1351252460-19953-1-git-send-email-ml@communistcode.co.uk>
Download mbox | patch
Permalink /patch/38591/
State New
Headers show

Comments

ml@communistcode.co.uk - Oct. 26, 2012, 11:54 a.m.
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

---

v2
- Don't use -D to define with make
- Rename EXTRA_OECONF_X to EXTRA_OEMAKE_X

When DISTRO_FEATURES does not contain x11, disable GTK GUI and
also don't add gtk+ to the DEPENDS

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
 .../latencytop/latencytop-0.5/latencytop-makefile.patch     | 13 +++++++------
 meta/recipes-kernel/latencytop/latencytop_0.5.bb            |  6 ++++--
 2 files changed, 11 insertions(+), 8 deletions(-)
Paul Eggleton - Oct. 26, 2012, 12:28 p.m.
On Friday 26 October 2012 12:54:18 Jack Mitchell wrote:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> 
> ---
> 
> v2
> - Don't use -D to define with make
> - Rename EXTRA_OECONF_X to EXTRA_OEMAKE_X
> 
> When DISTRO_FEATURES does not contain x11, disable GTK GUI and
> also don't add gtk+ to the DEPENDS
> 
> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

I think because the commit message is below the first --- it won't be picked up 
when applied. This is probably where a cover letter is more appropriate.

Cheers,
Paul
ml@communistcode.co.uk - Oct. 26, 2012, 12:35 p.m.
On 26/10/12 13:28, Paul Eggleton wrote:
> On Friday 26 October 2012 12:54:18 Jack Mitchell wrote:
>> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>>
>> ---
>>
>> v2
>> - Don't use -D to define with make
>> - Rename EXTRA_OECONF_X to EXTRA_OEMAKE_X
>>
>> When DISTRO_FEATURES does not contain x11, disable GTK GUI and
>> also don't add gtk+ to the DEPENDS
>>
>> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> I think because the commit message is below the first --- it won't be picked up
> when applied. This is probably where a cover letter is more appropriate.
>
> Cheers,
> Paul
>

Bah! One of these days I will get it right.

I think [1] should be updated for a few more use cases e.g. multiple 
patches.

So you're saying I should do:

git send-email -3 --no-chain-reply-to --cover-letter --to 
openembedded-core@lists.openembedded.org --subject-prefix=oe][PATCH

And also remove the '---' from my commit message on patch 1?
ml@communistcode.co.uk - Oct. 26, 2012, 12:37 p.m.
On 26/10/12 13:35, Jack Mitchell wrote:
> On 26/10/12 13:28, Paul Eggleton wrote:
>> On Friday 26 October 2012 12:54:18 Jack Mitchell wrote:
>>> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>>>
>>> ---
>>>
>>> v2
>>> - Don't use -D to define with make
>>> - Rename EXTRA_OECONF_X to EXTRA_OEMAKE_X
>>>
>>> When DISTRO_FEATURES does not contain x11, disable GTK GUI and
>>> also don't add gtk+ to the DEPENDS
>>>
>>> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>> I think because the commit message is below the first --- it won't be 
>> picked up
>> when applied. This is probably where a cover letter is more appropriate.
>>
>> Cheers,
>> Paul
>>
>
> Bah! One of these days I will get it right.
>
> I think [1] should be updated for a few more use cases e.g. multiple 
> patches.
>
> So you're saying I should do:
>
> git send-email -3 --no-chain-reply-to --cover-letter --to 
> openembedded-core@lists.openembedded.org --subject-prefix=oe][PATCH
>
> And also remove the '---' from my commit message on patch 1?
>

[1] http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded
Paul Eggleton - Oct. 26, 2012, 12:49 p.m.
On Friday 26 October 2012 13:37:04 Jack Mitchell wrote:
> So you're saying I should do:
> 
> git send-email -3 --no-chain-reply-to --cover-letter --to
> openembedded-core@lists.openembedded.org --subject-prefix=oe][PATCH
> 
> And also remove the '---' from my commit message on patch 1?

I don't use this method myself (for >1 patch I tend to use the create-pull-
request / send-pull-request scripts, but that assumes you have somewhere to 
push a branch); however that looks like it should be the right thing to do. 

> I think [1] should be updated for a few more use cases e.g. multiple
> patches.
> [1] http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

Unfortunately like most of the pages on the OE wiki this is out-of-date. 
Richard and I are going to try to set some time aside at ELCE to update the 
wiki or at the very least mark outdated information; hopefully we can convince 
others to join in as well.

Cheers,
Paul

Patch

diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
index 59a0b1f..596450c 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
@@ -1,8 +1,9 @@ 
-Upstream-Status: Inappropriate [configuration]
-
---- a/Makefile	2010-07-20 18:51:32.000000000 +0800
-+++ b/Makefile	2010-07-20 18:54:54.000000000 +0800
-@@ -4,7 +4,8 @@
+--- a/Makefile 2010-07-20 18:51:32.000000000 +0800
++++ b/Makefile 2010-07-20 18:54:54.000000000 +0800
+@@ -1,10 +1,8 @@
+-# FIXME: Use autoconf ?
+-HAS_GTK_GUI = 1
+-
  DESTDIR =
  SBINDIR = /usr/sbin
  XCFLAGS = -W  -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare
@@ -12,7 +13,7 @@  Upstream-Status: Inappropriate [configuration]
  
  OBJS= latencytop.o text_display.o translate.o fsync.o
  
-@@ -26,16 +27,17 @@
+@@ -26,16 +24,17 @@
  
  # We write explicity this "implicit rule"
  %.o : %.c
diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index 15f3667..695e12b 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
@@ -5,7 +5,7 @@  BUGTRACKER = "n/a"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa"
 
-DEPENDS = "virtual/libintl ncurses glib-2.0 gtk+"
+DEPENDS = "virtual/libintl ncurses glib-2.0  ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
 
 PR = "r2"
 
@@ -15,8 +15,10 @@  SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
 SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
 SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
 
+EXTRA_OEMAKE_X = "${@base_contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)}"
+
 CFLAGS += "${LDFLAGS}"
 
 do_install() {
-    oe_runmake install DESTDIR=${D}
+    oe_runmake install DESTDIR=${D} ${EXTRA_OEMAKE_X}
 }