diff options
| -rw-r--r-- | meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/babeltrace_1.2.1.bb (renamed from meta/recipes-kernel/lttng/babeltrace_1.1.1.bb) | 7 |
2 files changed, 21 insertions, 3 deletions
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 <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 index a6b8a97410..5c105d803b 100644 --- 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" |