summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2012-05-24 22:49:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:18:03 +0100
commitf887fd6c001f585530bd4c0bcfe0f6397009959d (patch)
treefe7bccfce53f5b986eb9a3aa40759b45b17b1f71
parent02b91dbc79c13ec201fb934dfb567b52f217d8b8 (diff)
downloadpoky-f887fd6c001f585530bd4c0bcfe0f6397009959d.tar.gz
lttng-tools: updated to 2.0.1
Removed patch for ARM compilation, as it seems that the upstream fixed the ARM compilation problem in a slightly different way (tested by compiling lttng-tools for MACHINE=qemuarm) (From OE-Core rev: aa43a37da4f14b5a184f79b2ff43b0cd491e49af) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch27
-rw-r--r--meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb (renamed from meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb)12
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 @@
1Upstream-Status: Pending
2
3Fix compiling error on powerpc and arm
4
5For powerpc and arm, some MAP_ are defined asm/mman.h,
6so including it in header.
7
8Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
9---
10 common/runas.c | 1 +
11 1 files changed, 1 insertions(+), 0 deletions(-)
12
13diff --git a/common/runas.c b/common/runas.c
14index f612ccc..62a2791 100644
15--- a/common/runas.c
16+++ b/common/runas.c
17@@ -29,6 +29,7 @@
18 #include <fcntl.h>
19 #include <sched.h>
20 #include <sys/mman.h>
21+#include <asm/mman.h>
22
23 #include <lttngerr.h>
24
25--
261.7.5.4
27
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 \
5and interpret them." 5and interpret them."
6 6
7LICENSE = "GPLv2 & LGPLv2.1" 7LICENSE = "GPLv2 & LGPLv2.1"
8LIC_FILES_CHKSUM = "file://COPYING;md5=ab682a4729389c3f11913d758affe98e \ 8LIC_FILES_CHKSUM = "file://LICENSE;md5=61273c2e3f60dd38a74b01beb5f51fbd \
9 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" 10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
11 11
12DEPENDS = "liburcu popt lttng2-ust" 12DEPENDS = "liburcu popt lttng2-ust"
13 13
14SRCREV = "9beed4cb465347c778e4f982c330cef78f2628b7" 14SRCREV = "8c3919ea2dc77fdd47fb1c90e41490a20bb4d478"
15PV = "v2.0.pre16+git${SRCREV}" 15PV = "v2.0.1+git${SRCREV}"
16PR = "r0" 16PR = "r0"
17 17
18SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git\ 18SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git"
19 file://lttng-tools-fix-compiling-error-for-powerpc-arm.patch"
20 19
21S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
22 21
@@ -24,6 +23,9 @@ inherit autotools
24 23
25export KERNELDIR="${STAGING_KERNEL_DIR}" 24export KERNELDIR="${STAGING_KERNEL_DIR}"
26 25
26FILES_${PN} += "${libdir}/lttng/libexec/*"
27FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
28
27# Due to liburcu not building for MIPS currently this recipe needs to 29# Due to liburcu not building for MIPS currently this recipe needs to
28# be limited also. 30# be limited also.
29# So here let us first suppport x86/arm/powerpc platforms now. 31# So here let us first suppport x86/arm/powerpc platforms now.