[PATCH 1/4] lttng-tools: Update to 2.2.0 based release

[PATCH 1/4] lttng-tools: Update to 2.2.0 based release

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../lttng/{lttng-tools_2.1.0.bb => lttng-tools_2.2.0.bb}             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-tools_2.1.0.bb => lttng-tools_2.2.0.bb} (92%)

diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.2.0.bb
similarity index 92%
rename from meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.2.0.bb
index e7ce7fc..e664d85 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.2.0.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
 
 DEPENDS = "liburcu popt lttng-ust"
 
-SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
-PV = "v2.1.0"
-PR = "r0"
+SRCREV = "eff0b2c38d24092c41bbb51926ac4e3b8c6acb83"
+PV = "v2.2.0"
 
 SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git"
 
-- 
1.8.3.1

[PATCH 2/4] lttng-modules: Update to 2.2.0 based release

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 66 +++++++++++++++++-----
 ...tng-modules_2.1.1.bb => lttng-modules_2.2.0.bb} |  5 +-
 2 files changed, 55 insertions(+), 16 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.1.1.bb => lttng-modules_2.2.0.bb} (90%)

diff --git a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
index aa24171..30f825c 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
@@ -7,35 +7,75 @@ build and install lttng-modules, we do this replacement for
 it as-is.
 
 Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
----
- Makefile |    7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 5ac13d7..25caad5 100644
+index a9d1cb1..c1b65b9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -38,17 +38,16 @@ obj-m += lib/
+@@ -43,19 +43,19 @@ obj-m += lib/
+ endif # CONFIG_TRACEPOINTS
+ 
+ else # KERNELRELEASE
+-	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
++	KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
+ 	PWD := $(shell pwd)
+ 	CFLAGS = $(EXTCFLAGS)
+ 
+ default:
+-	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
++	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
+ 
+ modules_install:
+-	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
++	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
+ 
+ clean:
+-	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
++	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
+ 
+ %.i: %.c
+-	$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
++	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@
+ endif # KERNELRELEASE
+diff --git a/README b/README
+index 8c5dd46..6bd3334 100644
+--- a/README
++++ b/README
+@@ -27,8 +27,8 @@ access to your full kernel source tree), and use:
+ If you need to specify the target directory to the kernel you want to build
+ against, use:
+ 
+-% KERNELDIR=path_to_kernel_dir make
+-# KERNELDIR=path_to_kernel_dir make modules_install
++% KERNEL_SRC=path_to_kernel_dir make
++# KERNEL_SRC=path_to_kernel_dir make modules_install
+ # depmod -a kernel_version
+ 
+ Use lttng-tools to control the tracer. LTTng tools should automatically load
+diff --git a/probes/Makefile b/probes/Makefile
+index 225803c..3449866 100644
+--- a/probes/Makefile
++++ b/probes/Makefile
+@@ -212,18 +212,18 @@ endif
  endif
-
+ 
  else
 -	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
++	KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
  	PWD := $(shell pwd)
  	CFLAGS = $(EXTCFLAGS)
-
+ 
  default:
 -	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
 +	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
-
+ 
  modules_install:
 -	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
 +	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
-
+ 	/sbin/depmod -a
+ 
  clean:
 -	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 +	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
-
+ 
  endif
--- 
-1.7.5.4
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
similarity index 90%
rename from meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
index 700c4c5..7926d12 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
@@ -10,9 +10,8 @@ DEPENDS = "virtual/kernel"
 
 inherit module
 
-SRCREV = "b374c356eb4827b68754d68adc0f1c94b5de9faa"
-PV = "2.1.1"
-PR = "r0"
+SRCREV = "1b26381c19dd2d9fa41f52d8dc13b15b8dd32c7c"
+PV = "2.2.0"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
            file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
-- 
1.8.3.1

[PATCH 3/4] lttng-ust: Update to 2.2.0 based release

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../lttng-ust/build-Fix-out-of-tree-build.patch    | 28 ++++++++++++++++++++++
 .../{lttng-ust_2.1.2.bb => lttng-ust_2.2.0.bb}     |  6 ++---
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
 rename meta/recipes-kernel/lttng/{lttng-ust_2.1.2.bb => lttng-ust_2.2.0.bb} (89%)

diff --git a/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
new file mode 100644
index 0000000..cc3220a
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust/build-Fix-out-of-tree-build.patch
@@ -0,0 +1,28 @@
+From d5a822fbeaec69e86c6af1f0ab8db0ff030f6678 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Tue, 2 Jul 2013 10:25:06 -0300
+Subject: [PATCH] build: Fix out-of-tree build
+
+To allow out-of-tree build, we need to include top_buildir in include
+directories or the generated config header won't be found.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ liblttng-ust-comm/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am
+index 2ae997c..065dbbf 100644
+--- a/liblttng-ust-comm/Makefile.am
++++ b/liblttng-ust-comm/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+ 
+ noinst_LTLIBRARIES = liblttng-ust-comm.la
+ 
+-- 
+1.8.3.1
+
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
similarity index 89%
rename from meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
index 93852b0..d03f207 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.1.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.2.0.bb
@@ -17,13 +17,13 @@ RPROVIDES_${PN} = "lttng2-ust"
 RREPLACES_${PN} = "lttng2-ust"
 RCONFLICTS_${PN} = "lttng2-ust"
 
-SRCREV = "3f7a0876566a432ad2cc2b27a2725641e36da92d"
-PV = "2.1.2"
-PR = "r0"
+SRCREV = "cfaee541fea7f5760b5501913c6902f5e4da9dba"
+PV = "2.2.0"
 PE = "2"
 
 SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \
 	   file://depends-liblttng-ust-tracepoin.patch \
+	   file://build-Fix-out-of-tree-build.patch \
 	   "
 
 S = "${WORKDIR}/git"
-- 
1.8.3.1

[PATCH 4/4] babeltrace: Update to 1.1.1 based release

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-kernel/lttng/{babeltrace_1.1.0.bb => babeltrace_1.1.1.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{babeltrace_1.1.0.bb => babeltrace_1.1.1.bb} (91%)

diff --git a/meta/recipes-kernel/lttng/babeltrace_1.1.0.bb b/meta/recipes-kernel/lttng/babeltrace_1.1.1.bb
similarity index 91%
rename from meta/recipes-kernel/lttng/babeltrace_1.1.0.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.1.1.bb
index dd7e056..8aa3ae1 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.1.0.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.1.1.bb
@@ -10,9 +10,8 @@ inherit autotools
 
 DEPENDS = "glib-2.0 util-linux popt"
 
-SRCREV = "c99b1910bea848e8f0ae5641bb63b8f4f84f3ec0"
+SRCREV = "a386e24609752742b100120db6798d311fab512a"
 PV = "1.1+git${SRCPV}"
-PR = "r0"
 
 SRC_URI = "git://git.efficios.com/babeltrace.git;protocol=git"
 
-- 
1.8.3.1