Improve x11 distro_feature checks
cover Improve x11 distro_feature checks
From: Jack Mitchell <[email protected]>
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(-)
Signature · 1 line
1.8.0
PATCH 1/3 latencytop: disable GTK and remove gtk+ dependacy
From: Jack Mitchell <[email protected]>
When DISTRO_FEATURES does not contain x11, disable GTK GUI and also don't add gtk+ to the DEPENDS
--- .../latencytop/latencytop-0.5/latencytop-makefile.patch | 13 +++++++------ meta/recipes-kernel/latencytop/latencytop_0.5.bb | 8 +++++--- 2 files changed, 12 insertions(+), 9 deletions(-)
meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch +7 -6
@@ -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
meta/recipes-kernel/latencytop/latencytop_0.5.bb +5 -3
@@ -5,9 +5,9 @@ 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" +PR = "r3" SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \ file://latencytop-makefile.patch"
@@ -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} }
Signature · 1 line
1.8.0
PATCH 2/3 packagegroup-core-tools-profile: include sysprof only if x11 is distro feature
In reply to Jack MitchellFrom: Jack Mitchell <[email protected]>
--- meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +4 -2
@@ -5,7 +5,7 @@ SUMMARY = "Profiling tools" LICENSE = "MIT" -PR = "r2" +PR = "r3" inherit packagegroup
@@ -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 = "\
Signature · 1 line
1.8.0
PATCH 3/3 babeltrace: fix depends
In reply to Jack MitchellFrom: Jack Mitchell <[email protected]>
--- meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb +2 -2
@@ -8,11 +8,11 @@ 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}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.efficios.com/babeltrace.git;protocol=git"
Signature · 1 line
1.8.0
Quoted 17 lines · Jack Mitchell
From: Jack Mitchell <[email protected]>
Improvement to the detection of the x11
distro_featurein 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 indistro_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
Quoted 6 lines
.../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(-)
Please ignore, sent to wrong list inerror.
Need more tea.
Signature · 5 lines
Jack Mitchell ([email protected]) Embedded Systems Engineer http://www.embed.me.uk --