summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-07-02 11:14:40 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:34:24 +0100
commita3cf4a5aeee9090c48a6813335301ed01e36a9b5 (patch)
treea724cf43af8176efa50e78b55e42cc5a9b20d5a8 /meta/recipes-kernel
parent2615000d76d53fca3e1fd3af062354759c7b2a50 (diff)
downloadpoky-a3cf4a5aeee9090c48a6813335301ed01e36a9b5.tar.gz
lttng-modules: Update to 2.2.0 based release
(From OE-Core rev: 9436f568c23fa669f6db9c75c6e7d0a9f92f5a3a) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch66
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb (renamed from meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb)5
2 files changed, 55 insertions, 16 deletions
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 aa24171f31..30f825c414 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
7it as-is. 7it as-is.
8 8
9Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> 9Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
10---
11 Makefile | 7 +++----
12 1 files changed, 3 insertions(+), 4 deletions(-)
13 10
14diff --git a/Makefile b/Makefile 11diff --git a/Makefile b/Makefile
15index 5ac13d7..25caad5 100644 12index a9d1cb1..c1b65b9 100644
16--- a/Makefile 13--- a/Makefile
17+++ b/Makefile 14+++ b/Makefile
18@@ -38,17 +38,16 @@ obj-m += lib/ 15@@ -43,19 +43,19 @@ obj-m += lib/
16 endif # CONFIG_TRACEPOINTS
17
18 else # KERNELRELEASE
19- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
20+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
21 PWD := $(shell pwd)
22 CFLAGS = $(EXTCFLAGS)
23
24 default:
25- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
26+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
27
28 modules_install:
29- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
30+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
31
32 clean:
33- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
34+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
35
36 %.i: %.c
37- $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
38+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@
39 endif # KERNELRELEASE
40diff --git a/README b/README
41index 8c5dd46..6bd3334 100644
42--- a/README
43+++ b/README
44@@ -27,8 +27,8 @@ access to your full kernel source tree), and use:
45 If you need to specify the target directory to the kernel you want to build
46 against, use:
47
48-% KERNELDIR=path_to_kernel_dir make
49-# KERNELDIR=path_to_kernel_dir make modules_install
50+% KERNEL_SRC=path_to_kernel_dir make
51+# KERNEL_SRC=path_to_kernel_dir make modules_install
52 # depmod -a kernel_version
53
54 Use lttng-tools to control the tracer. LTTng tools should automatically load
55diff --git a/probes/Makefile b/probes/Makefile
56index 225803c..3449866 100644
57--- a/probes/Makefile
58+++ b/probes/Makefile
59@@ -212,18 +212,18 @@ endif
19 endif 60 endif
20 61
21 else 62 else
22- KERNELDIR ?= /lib/modules/$(shell uname -r)/build 63- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
64+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
23 PWD := $(shell pwd) 65 PWD := $(shell pwd)
24 CFLAGS = $(EXTCFLAGS) 66 CFLAGS = $(EXTCFLAGS)
25 67
26 default: 68 default:
27- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules 69- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
28+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules 70+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
29 71
30 modules_install: 72 modules_install:
31- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install 73- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
32+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install 74+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
33 75 /sbin/depmod -a
76
34 clean: 77 clean:
35- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean 78- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
36+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean 79+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
37 80
38 endif 81 endif
39--
401.7.5.4
41
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb
index 0bbaa817ca..dd35396205 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"
10 10
11inherit module 11inherit module
12 12
13SRCREV = "b374c356eb4827b68754d68adc0f1c94b5de9faa" 13SRCREV = "1b26381c19dd2d9fa41f52d8dc13b15b8dd32c7c"
14PV = "2.1.1" 14PV = "2.2.0"
15PR = "r0"
16 15
17SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \ 16SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
18 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" 17 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"