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 <cristiana.voicu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

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 (file)
index 0000000..258eedd
--- /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 <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
+ 
+

diff --git a/meta/recipes-kernel/lttng/babeltrace_1.1.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb
similarity index 72%
rename from meta/recipes-kernel/lttng/babeltrace_1.1.1.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.2.1.bb
index a6b8a974107652953e703a19ae7da4b5b3f5c8f8..5c105d803b5e7ef3b3a40fa21c9a81578850451d 100644 (file)
--- a/meta/recipes-kernel/lttng/babeltrace_1.1.1.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb
@@ -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"