2 files changed, 7 insertions, 32 deletions

diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch b/meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
deleted file mode 100644
index 73253d1a63..0000000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Pending
-
-Fix compiling error on powerpc and arm
-
-For powerpc and arm, some MAP_ are defined asm/mman.h,
-so including it in header.
-
-Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
----
- common/runas.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/common/runas.c b/common/runas.c
-index f612ccc..62a2791 100644
---- a/common/runas.c
-+++ b/common/runas.c
-@@ -29,6 +29,7 @@
- #include <fcntl.h>
- #include <sched.h>
- #include <sys/mman.h>
-+#include <asm/mman.h>
-
- #include <lttngerr.h>
-
--- 
-1.7.5.4
-
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
index d3a6a30706..e7f10163df 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
@@ -5,18 +5,17 @@ to extract program execution details from the Linux operating system \
 and interpret them."
 
 LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ab682a4729389c3f11913d758affe98e \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=61273c2e3f60dd38a74b01beb5f51fbd \
                     file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
 
 DEPENDS = "liburcu popt lttng2-ust"
 
-SRCREV = "9beed4cb465347c778e4f982c330cef78f2628b7"
-PV = "v2.0.pre16+git${SRCREV}"
+SRCREV = "8c3919ea2dc77fdd47fb1c90e41490a20bb4d478"
+PV = "v2.0.1+git${SRCREV}"
 PR = "r0"
 
-SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git\
-           file://lttng-tools-fix-compiling-error-for-powerpc-arm.patch"
+SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
@@ -24,6 +23,9 @@ inherit autotools
 
 export KERNELDIR="${STAGING_KERNEL_DIR}"
 
+FILES_${PN} += "${libdir}/lttng/libexec/*"
+FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+
 # Due to liburcu not building for MIPS currently this recipe needs to
 # be limited also.
 # So here let us first suppport x86/arm/powerpc platforms now.