2 files changed, 19 insertions, 1 deletions

diff --git a/meta/recipes-kernel/lttng/fix-powerpc64.patch b/meta/recipes-kernel/lttng/fix-powerpc64.patch
new file mode 100644
index 0000000000..3c3484c678
--- /dev/null
+++ b/meta/recipes-kernel/lttng/fix-powerpc64.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Submitted
+
+Add bit to detect if we are running on powerpc64 and treat it the
+same as ppc64
+
+Index: ust-0.15/configure.ac
+===================================================================
+--- ust-0.15.orig/configure.ac
++++ ust-0.15/configure.ac
+@@ -111,6 +111,7 @@ changequote([,])dnl
+        x86_64) LIBFORMAT="elf64-x86-64" ;;
+        powerpc) LIBFORMAT="elf32-powerpc" ;;
+        ppc64) LIBFORMAT="elf64-powerpc" ;;
++       powerpc64) LIBFORMAT="elf64-powerpc" ;;
+        s390) LIBFORMAT="elf32-s390" ;;
+        s390x) LIBFORMAT="elf64-s390" ;;
+         armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.15.bb b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
index 915e619c8c..9dd4658643 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
 
 DEPENDS = "liburcu"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"
+SRC_URI_append_powerpc64 = " file://fix-powerpc64.patch"
 
 SRC_URI[md5sum] = "86c71486a70695dc0b2171ad16fc82b3" 
 SRC_URI[sha256sum] = "7ff7ecdc051c0649d5fd21b5ceff4895ca95dc34f14cdc04e50de13cfd1903c5"