* [PATCH 0/3] Improve x11 distro_feature checks
@ 2012-10-26 13:37 Jack Mitchell
2012-10-26 13:37 ` [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy Jack Mitchell
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jack Mitchell @ 2012-10-26 13:37 UTC (permalink / raw)
To: openembedded-core; +Cc: Jack Mitchell
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Improvement to the detection of the x11 distro_feature in a few recipes
with the final achievement being that GTK+ is no longer required in
core-image-minimal if dbg-pkgs, tools-profile and tools-debug are enabled
when x11 is not in distro_features.
Jack Mitchell (3):
latencytop: disable GTK and remove gtk+ dependacy
packagegroup-core-tools-profile: include sysprof only if x11 is
distro feature
babeltrace: fix depends
.../packagegroups/packagegroup-core-tools-profile.bb | 4 +++-
.../latencytop/latencytop-0.5/latencytop-makefile.patch | 13 +++++++------
meta/recipes-kernel/latencytop/latencytop_0.5.bb | 6 ++++--
meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb | 2 +-
4 files changed, 15 insertions(+), 10 deletions(-)
--
1.8.0
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy 2012-10-26 13:37 [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell @ 2012-10-26 13:37 ` Jack Mitchell 2012-10-26 13:39 ` Jack Mitchell 2012-10-26 13:37 ` [PATCH 2/3] packagegroup-core-tools-profile: include sysprof only if x11 is distro feature Jack Mitchell ` (2 subsequent siblings) 3 siblings, 1 reply; 7+ messages in thread From: Jack Mitchell @ 2012-10-26 13:37 UTC (permalink / raw) To: openembedded-core; +Cc: Jack Mitchell From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> 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(-) 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} } -- 1.8.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy 2012-10-26 13:37 ` [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy Jack Mitchell @ 2012-10-26 13:39 ` Jack Mitchell 0 siblings, 0 replies; 7+ messages in thread From: Jack Mitchell @ 2012-10-26 13:39 UTC (permalink / raw) To: openembedded-core Apologies for the double send - I don't know why this second set came through! -- Jack Mitchell (jack@embed.me.uk) Embedded Systems Engineer http://www.embed.me.uk -- ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] packagegroup-core-tools-profile: include sysprof only if x11 is distro feature 2012-10-26 13:37 [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell 2012-10-26 13:37 ` [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy Jack Mitchell @ 2012-10-26 13:37 ` Jack Mitchell 2012-10-26 13:37 ` [PATCH 3/3] babeltrace: fix depends Jack Mitchell 2012-10-28 1:12 ` [PATCH 0/3] Improve x11 distro_feature checks Saul Wold 3 siblings, 0 replies; 7+ messages in thread From: Jack Mitchell @ 2012-10-26 13:37 UTC (permalink / raw) To: openembedded-core; +Cc: Jack Mitchell From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> --- meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 369a646..2d37eb8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -16,12 +16,14 @@ RPROVIDES_${PN} = "task-core-tools-profile" RREPLACES_${PN} = "task-core-tools-profile" RCONFLICTS_${PN} = "task-core-tools-profile" +PROFILE_TOOLS_X = "${@base_contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" + RRECOMMENDS_${PN} = "\ perf \ trace-cmd \ kernel-module-oprofile \ blktrace \ - sysprof \ + ${PROFILE_TOOLS_X} \ " PROFILETOOLS = "\ -- 1.8.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] babeltrace: fix depends 2012-10-26 13:37 [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell 2012-10-26 13:37 ` [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy Jack Mitchell 2012-10-26 13:37 ` [PATCH 2/3] packagegroup-core-tools-profile: include sysprof only if x11 is distro feature Jack Mitchell @ 2012-10-26 13:37 ` Jack Mitchell 2012-10-28 1:12 ` [PATCH 0/3] Improve x11 distro_feature checks Saul Wold 3 siblings, 0 replies; 7+ messages in thread From: Jack Mitchell @ 2012-10-26 13:37 UTC (permalink / raw) To: openembedded-core; +Cc: Jack Mitchell From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> --- meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb b/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb index 95d65f5..fb2d799 100644 --- a/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb +++ b/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8d1a03b3c17bdd158b3cbb34813b1423" inherit autotools -DEPENDS = "gtk+ util-linux" +DEPENDS = "glib-2.0 util-linux popt" SRCREV = "0d8f8c2ea27df096269aa76b4baeab26b68b95d4" PV = "0.12+git${SRCPV}" -- 1.8.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/3] Improve x11 distro_feature checks 2012-10-26 13:37 [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell ` (2 preceding siblings ...) 2012-10-26 13:37 ` [PATCH 3/3] babeltrace: fix depends Jack Mitchell @ 2012-10-28 1:12 ` Saul Wold 3 siblings, 0 replies; 7+ messages in thread From: Saul Wold @ 2012-10-28 1:12 UTC (permalink / raw) To: Jack Mitchell; +Cc: Jack Mitchell, openembedded-core On 10/26/2012 06:37 AM, Jack Mitchell wrote: > From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> > > Improvement to the detection of the x11 distro_feature in a few recipes > with the final achievement being that GTK+ is no longer required in > core-image-minimal if dbg-pkgs, tools-profile and tools-debug are enabled > when x11 is not in distro_features. > > > Jack Mitchell (3): > latencytop: disable GTK and remove gtk+ dependacy > packagegroup-core-tools-profile: include sysprof only if x11 is > distro feature > babeltrace: fix depends > These all need PR Bumps. Thanks Sau! > .../packagegroups/packagegroup-core-tools-profile.bb | 4 +++- > .../latencytop/latencytop-0.5/latencytop-makefile.patch | 13 +++++++------ > meta/recipes-kernel/latencytop/latencytop_0.5.bb | 6 ++++-- > meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb | 2 +- > 4 files changed, 15 insertions(+), 10 deletions(-) > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 0/3] Improve x11 distro_feature checks
@ 2012-10-29 9:28 Jack Mitchell
0 siblings, 0 replies; 7+ messages in thread
From: Jack Mitchell @ 2012-10-29 9:28 UTC (permalink / raw)
To: openembedded-core; +Cc: Jack Mitchell
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Improvement to the detection of the x11 distro_feature in a few recipes
with the final achievement being that GTK+ is no longer required in
core-image-minimal if dbg-pkgs, tools-profile and tools-debug are enabled
when x11 is not in distro_features.
V2
Added PR bumps to all recipes
Jack Mitchell (3):
latencytop: disable GTK and remove gtk+ dependacy
packagegroup-core-tools-profile: include sysprof only if x11 is
distro feature
babeltrace: fix depends
.../packagegroups/packagegroup-core-tools-profile.bb | 4 +++-
.../latencytop/latencytop-0.5/latencytop-makefile.patch | 13 +++++++------
meta/recipes-kernel/latencytop/latencytop_0.5.bb | 6 ++++--
meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb | 2 +-
4 files changed, 15 insertions(+), 10 deletions(-)
--
1.8.0
^ permalink raw reply [flat|nested] 7+ messages in threadend of thread, other threads:[~2012-10-29 9:40 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-10-26 13:37 [PATCH 0/3] Improve x11 distro_feature checks Jack Mitchell 2012-10-26 13:37 ` [PATCH 1/3] latencytop: disable GTK and remove gtk+ dependacy Jack Mitchell 2012-10-26 13:39 ` Jack Mitchell 2012-10-26 13:37 ` [PATCH 2/3] packagegroup-core-tools-profile: include sysprof only if x11 is distro feature Jack Mitchell 2012-10-26 13:37 ` [PATCH 3/3] babeltrace: fix depends Jack Mitchell 2012-10-28 1:12 ` [PATCH 0/3] Improve x11 distro_feature checks Saul Wold -- strict thread matches above, loose matches on Subject: below -- 2012-10-29 9:28 Jack Mitchell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox