From 27bf30e3ce505468678f8c9675c3c1648e3c7ec8 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 9 May 2018 14:46:42 -0700 Subject: babeltrace: move ASNEEDED over-ride into the babeltrace recipe Move the recipe specific over-ride for ASNEEDED into the recipe to make it more apparent that the over-ride is being applied (and that it should be re-checked on version updates, etc). Also misc minor recipe cleanup (re-order variables to follow the OE style guide, etc). (From OE-Core rev: 6c08a062c151c2d2562016434f6f2125f2959fa6) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/distro/include/as-needed.inc | 1 - meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc index 6a8ad9d624..38de3a10f2 100644 --- a/meta/conf/distro/include/as-needed.inc +++ b/meta/conf/distro/include/as-needed.inc @@ -1,7 +1,6 @@ ASNEEDED = "-Wl,--as-needed" -ASNEEDED_pn-babeltrace = "" ASNEEDED_pn-console-tools = "" ASNEEDED_pn-distcc = "" ASNEEDED_pn-openobex = "" diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb index 5d7a7efd2f..2a2fa1e5b1 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb @@ -2,18 +2,18 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower" DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." HOMEPAGE = "http://www.efficios.com/babeltrace/" BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" - LICENSE = "MIT & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -inherit autotools pkgconfig +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e" + +S = "${WORKDIR}/git" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ -" +inherit autotools pkgconfig EXTRA_OECONF = "--disable-debug-info" -S = "${WORKDIR}/git" -SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e" +ASNEEDED = "" -- cgit v1.2.3-54-g00ecf