2 files changed, 31 insertions, 3 deletions

diff --git a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
new file mode 100644
index 0000000000..cc3220ac18
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
@@ -0,0 +1,28 @@
+From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Tue, 2 Jul 2013 10:25:06 -0300
+Subject: [PATCH] build: Fix out-of-tree build
+
+To allow out-of-tree build, we need to include top_buildir in include
+directories or the generated config header won't be found.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ liblttng-ust-comm/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am
+index 2ae997c..065dbbf 100644
+--- a/liblttng-ust-comm/Makefile.am
++++ b/liblttng-ust-comm/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+ 
+ noinst_LTLIBRARIES = liblttng-ust-comm.la
+ 
+-- 
+1.8.3.1
+
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
index 93852b0af6..d03f20701b 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
@@ -17,13 +17,13 @@ RPROVIDES_${PN} = "lttng2-ust"
 RREPLACES_${PN} = "lttng2-ust"
 RCONFLICTS_${PN} = "lttng2-ust"
 
-SRCREV = "3f7a0876566a432ad2cc2b27a2725641e36da92d"
-PV = "2.1.2"
-PR = "r0"
+SRCREV = "cfaee541fea7f5760b5501913c6902f5e4da9dba"
+PV = "2.2.0"
 PE = "2"
 
 SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \
            file://depends-liblttng-ust-tracepoin.patch \
+           file://build-Fix-out-of-tree-build.patch \
            "
 
 S = "${WORKDIR}/git"