From 699d6c02140a37262d8e5daf29143db22a5a5d0b Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Tue, 6 May 2014 11:26:15 +0300 Subject: babeltrace: upgrade to 1.2.1 The release for 1.2.1 is on branch stable-1.2. Backported a patch to fix out of tree build. Signed-off-by: Cristiana Voicu Signed-off-by: Saul Wold --- ...-Support-out-of-tree-builds-in-babeltrace.patch | 17 ++++++++++++++++ meta/recipes-kernel/lttng/babeltrace_1.1.1.bb | 22 --------------------- meta/recipes-kernel/lttng/babeltrace_1.2.1.bb | 23 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch delete mode 100644 meta/recipes-kernel/lttng/babeltrace_1.1.1.bb create mode 100644 meta/recipes-kernel/lttng/babeltrace_1.2.1.bb diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch new file mode 100644 index 0000000000..258eedd3ba --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch @@ -0,0 +1,17 @@ +Upstream-Status: backport + +babeltrace: Fix support out of tree builds in babeltrace + +Signed-off-by: Lars Persson + +diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am +index c834699..2c6b0bd 100644 +--- a/formats/lttng-live/Makefile.am ++++ b/formats/lttng-live/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include ++AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir) + + lib_LTLIBRARIES = libbabeltrace-lttng-live.la + + diff --git a/meta/recipes-kernel/lttng/babeltrace_1.1.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.1.1.bb deleted file mode 100644 index a6b8a97410..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace_1.1.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -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" - -inherit autotools - -DEPENDS = "glib-2.0 util-linux popt" - -SRCREV = "a386e24609752742b100120db6798d311fab512a" -PV = "1.1.1+git${SRCPV}" - -SRC_URI = "git://git.efficios.com/babeltrace.git" - -S = "${WORKDIR}/git" - -do_configure_prepend () { - ( cd ${S}; ${S}/bootstrap ) -} diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb new file mode 100644 index 0000000000..5c105d803b --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb @@ -0,0 +1,23 @@ +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" + +inherit autotools + +DEPENDS = "glib-2.0 util-linux popt" + +SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79" +PV = "1.2.1+git${SRCPV}" + +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \ + file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch" + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ( cd ${S}; ${S}/bootstrap ) +} -- cgit v1.2.3