[PATCH 0/1] lttng-2.0: fix compiliation error

[PATCH 0/1] lttng-2.0: fix compiliation error

[Bruce Ashfield]

Richard/Saul,

Here's a fix for the recent lttng-2.0 modules build error that
was reported. The recent -stable update created a collision with
is_compat_task() that was already being defined as a fallback
within lttng 2.0.

I've made a patch fix, versus updating lttng-2.0 .. since churning
this package would be a good idea right now.

Cheers,

Bruce

The following changes since commit a9873f12e5ba11e1307440901d07e9642e9f53bf:

  pigz: Ensure DEPENDS on zlib exists for native and target versions (2012-03-19 14:37:46 +0000)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
 compliation error with 3.2.x -stable kernels

 ...ls-protect-is_compat_task-from-redefiniti.patch |   41 ++++++++++++++++++++
 .../lttng-2.0/lttng-modules_2.0.pre11.bb           |    3 +-
 2 files changed, 43 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch

-- 
1.7.5.4

[PATCH 1/1] lttng-modules: fix compliation error with 3.2.x -stable kernels

[Bruce Ashfield]

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>
---
 ...ls-protect-is_compat_task-from-redefiniti.patch |   41 ++++++++++++++++++++
 .../lttng-2.0/lttng-modules_2.0.pre11.bb           |    3 +-
 2 files changed, 43 insertions(+), 1 deletions(-)
 create 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
new file mode 100644
index 0000000..0056633
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
@@ -0,0 +1,41 @@
+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
+
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
index fa7bbec..4c78f36 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
@@ -15,7 +15,8 @@ PV = "2.0.pre11+git${SRCREV}"
 PR = "r0"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
+           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
+           file://lttng-sycalls-protect-is_compat_task-from-redefiniti.patch"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 export KERNEL_SRC="${STAGING_KERNEL_DIR}"
-- 
1.7.5.4

Re: [PATCH 0/1] lttng-2.0: fix compiliation error

[Saul Wold]

On 03/19/2012 10:53 AM, Bruce Ashfield wrote:
> Richard/Saul,
>
> Here's a fix for the recent lttng-2.0 modules build error that
> was reported. The recent -stable update created a collision with
> is_compat_task() that was already being defined as a fallback
> within lttng 2.0.
>
> I've made a patch fix, versus updating lttng-2.0 .. since churning
> this package would be a good idea right now.
>
> Cheers,
>
> Bruce
>
> The following changes since commit a9873f12e5ba11e1307440901d07e9642e9f53bf:
>
>    pigz: Ensure DEPENDS on zlib exists for native and target versions (2012-03-19 14:37:46 +0000)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib zedd/kernel
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
>   compliation error with 3.2.x -stable kernels
>
>   ...ls-protect-is_compat_task-from-redefiniti.patch |   41 ++++++++++++++++++++
>   .../lttng-2.0/lttng-modules_2.0.pre11.bb           |    3 +-
>   2 files changed, 43 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
>
Merged into OE-Core

Thanks
	Sau!