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.

(From OE-Core rev: 699d6c02140a37262d8e5daf29143db22a5a5d0b)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Cristiana Voicu
2014-05-06 11:26:15 +03:00
committed by Richard Purdie
parent 9bf4e656e1
commit cd6f81999a
2 changed files with 21 additions and 3 deletions

View File

@@ -0,0 +1,17 @@
Upstream-Status: backport
babeltrace: Fix support out of tree builds in babeltrace
Signed-off-by: Lars Persson <larper@axis.com>
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

View File

@@ -10,10 +10,11 @@ inherit autotools
DEPENDS = "glib-2.0 util-linux popt"
SRCREV = "a386e24609752742b100120db6798d311fab512a"
PV = "1.1.1+git${SRCPV}"
SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79"
PV = "1.2.1+git${SRCPV}"
SRC_URI = "git://git.efficios.com/babeltrace.git"
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"