* [PATCH 1/3] packagegroup-core-tools-profile: replace 'legacy' lttng with lttng 2.0
2012-11-13 17:26 [PATCH 0/3] lttng updates for danny-next tom.zanussi
@ 2012-11-13 17:26 ` tom.zanussi
2012-11-13 17:26 ` [PATCH 2/3] lttng-2.0: fix srcrev/pv to match the recipe filenames tom.zanussi
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2012-11-13 17:26 UTC (permalink / raw)
To: ross.burton, openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
packagegroup-core-tools-profile currently pulls in the 'legacy' lttng
packages, which are useless without legacy lttng support in the kernel.
This makes packagegroup-core-tools-profile pull in the lttng 2.0
packages instead, which don't need any kernel modifications to work.
(From OE-Core rev: f1f9d08ea8b32b0a51a1e3f7bcf488ba7e9dc21e)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../packagegroup-core-tools-profile.bb | 25 ++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 1035036..edf41b1 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -5,7 +5,7 @@
SUMMARY = "Profiling tools"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
inherit packagegroup
@@ -29,8 +29,7 @@ PROFILETOOLS = "\
oprofileui-server \
powertop \
latencytop \
- lttng-control \
- lttng-viewer"
+ "
# systemtap needs elfutils which is not fully buildable on uclibc
# hence we exclude it from uclibc based builds
@@ -44,10 +43,25 @@ SYSTEMTAP_mips = ""
# which means we can not use syscall() to call it. So we ignore
# it for x86_64/uclibc
-LTTNGUST = "lttng-ust"
+LTTNGUST = "lttng2-ust"
LTTNGUST_libc-uclibc = ""
LTTNGUST_mips = ""
+# lttng-tools, lttng-modules and babeltrace all depend on liburcu
+# which currentl doesn't build on mips
+
+LTTNGTOOLS = "lttng-tools"
+LTTNGTOOLS_mips = ""
+LTTNGTOOLS_aarch64 = ""
+
+LTTNGMODULES = "lttng-modules"
+LTTNGMODULES_mips = ""
+LTTNGMODULES_aarch64 = ""
+
+BABELTRACE = "babeltrace"
+BABELTRACE_mips = ""
+BABELTRACE_aarch64 = ""
+
# valgrind does not work on mips
VALGRIND = "valgrind"
@@ -65,6 +79,9 @@ VALGRIND_arm = ""
RDEPENDS_${PN} = "\
${PROFILETOOLS} \
${LTTNGUST} \
+ ${LTTNGTOOLS} \
+ ${LTTNGMODULES} \
+ ${BABELTRACE} \
${SYSTEMTAP} \
${VALGRIND} \
"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] lttng-2.0: fix srcrev/pv to match the recipe filenames
2012-11-13 17:26 [PATCH 0/3] lttng updates for danny-next tom.zanussi
2012-11-13 17:26 ` [PATCH 1/3] packagegroup-core-tools-profile: replace 'legacy' lttng with lttng 2.0 tom.zanussi
@ 2012-11-13 17:26 ` tom.zanussi
2012-11-13 17:26 ` [PATCH 3/3] lttng-modules: remove unused lttng-syscalls patch tom.zanussi
2012-11-26 13:37 ` [PATCH 0/3] lttng updates for danny-next Burton, Ross
3 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2012-11-13 17:26 UTC (permalink / raw)
To: ross.burton, openembedded-core
From: Christopher Larson <chris_larson@mentor.com>
Somehow the recipe names got bumped, but the SRCREV and PVs in the recipes
didn't get updated, so they were still building old versions.
(From OE-Core rev: b3bffb0d34f99f31b65ddb886d80f71786120bbf)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb | 7 +++----
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb | 4 ++--
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
index 4c78f36..baae25f 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
@@ -10,13 +10,12 @@ DEPENDS = "virtual/kernel"
inherit module
-SRCREV = "4d3e89e379fc66480d729abe8daa5c86eb585400"
-PV = "2.0.pre11+git${SRCREV}"
+SRCREV = "a848cad4cc82d05493c487a709f6b55f22695ec6"
+PV = "2.0.5"
PR = "r0"
SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
- file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
- file://lttng-sycalls-protect-is_compat_task-from-redefiniti.patch"
+ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
export INSTALL_MOD_DIR="kernel/lttng-modules"
export KERNEL_SRC="${STAGING_KERNEL_DIR}"
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb
index e7f1016..0bafcb3 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61273c2e3f60dd38a74b01beb5f51fbd \
DEPENDS = "liburcu popt lttng2-ust"
-SRCREV = "8c3919ea2dc77fdd47fb1c90e41490a20bb4d478"
-PV = "v2.0.1+git${SRCREV}"
+SRCREV = "98c8c95b0e1afb2dac686338efdf036f6446d790"
+PV = "v2.0.4"
PR = "r0"
SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git"
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb
index 8f650a4..0574fe9 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb
@@ -12,8 +12,8 @@ inherit autotools
DEPENDS = "liburcu util-linux"
-SRCREV = "a367ee66aad3ffd21ef64d1b24efc6f862e09562"
-PV = "2.0.2+git${SRCPV}"
+SRCREV = "5fbf75f52c808b648feebea1ed4874c5f6264b05"
+PV = "2.0.5"
PR = "r0"
SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] lttng-modules: remove unused lttng-syscalls patch
2012-11-13 17:26 [PATCH 0/3] lttng updates for danny-next tom.zanussi
2012-11-13 17:26 ` [PATCH 1/3] packagegroup-core-tools-profile: replace 'legacy' lttng with lttng 2.0 tom.zanussi
2012-11-13 17:26 ` [PATCH 2/3] lttng-2.0: fix srcrev/pv to match the recipe filenames tom.zanussi
@ 2012-11-13 17:26 ` tom.zanussi
2012-11-26 13:37 ` [PATCH 0/3] lttng updates for danny-next Burton, Ross
3 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2012-11-13 17:26 UTC (permalink / raw)
To: ross.burton, openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
commit b7e184508 (lttng-2.0: fix srcrev/pv to match the recipe
filenames) removed the
lttng-sycalls-protect-is_compat_task-from-redefiniti.patch from the
SRC_URI but forgot to remove the patch itself.
(From OE-Core rev: 6745b927a40e523cfda4ce2ca6422d69a6791e8a)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
...ls-protect-is_compat_task-from-redefiniti.patch | 41 ----------------------
1 file changed, 41 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
deleted file mode 100644
index 0056633..0000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 19 Mar 2012 13:30:31 -0400
-Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition
-
-recent -stable kernels have their own fallback definition of is_compat_task
-
- #define is_compat_task() (0)
-
-To protect against this double definition of is_compat_task we can check
-to see if it is already defined, and skip the lttng variant.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- lttng-syscalls.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lttng-syscalls.c b/lttng-syscalls.c
-index 9de3c07..80d0f05 100644
---- a/lttng-syscalls.c
-+++ b/lttng-syscalls.c
-@@ -17,12 +17,16 @@
- #include "ltt-events.h"
-
- #ifndef CONFIG_COMPAT
-+
-+#ifndef is_compat_task
- static inline int is_compat_task(void)
- {
- return 0;
- }
- #endif
-
-+#endif
-+
- static
- void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
-
---
-1.7.5.4
-
--
1.7.11.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/3] lttng updates for danny-next
2012-11-13 17:26 [PATCH 0/3] lttng updates for danny-next tom.zanussi
` (2 preceding siblings ...)
2012-11-13 17:26 ` [PATCH 3/3] lttng-modules: remove unused lttng-syscalls patch tom.zanussi
@ 2012-11-26 13:37 ` Burton, Ross
3 siblings, 0 replies; 5+ messages in thread
From: Burton, Ross @ 2012-11-26 13:37 UTC (permalink / raw)
To: tom.zanussi; +Cc: openembedded-core
On 13 November 2012 17:26, <tom.zanussi@intel.com> wrote:
> These are the lttng fixes that didn't get pulled into danny (but
> are now in master), so I'm resubmitting them for danny-next.
>
> Tested on crownbay.
>
> Please pull into danny-next.
Merged locally to danny-next.
Ross
^ permalink raw reply [flat|nested] 5+ messages in thread