summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2015-05-12 12:02:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-16 22:31:50 +0100
commitcdf81801ba10caa87b857a2c345405e6a7db2547 (patch)
tree095e8e43a42eb9b46188b448e72221bfb2f42821 /meta
parente5f9a2cbe7f9ace072f0eaf1f9d51886a70c561b (diff)
downloadpoky-cdf81801ba10caa87b857a2c345405e6a7db2547.tar.gz
lttng-modules: Update to stable version 2.6.1
This fixes a build issue with the 3.19.5 kernel where the regmap prototypes have changed. The patch is rebased do to changes in the new version of the Makefile. [YOCTO #7737] (From OE-Core rev: 787fde133c6b50c5df6ce8f90b2906b7955b41e4) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch31
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb (renamed from meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb)2
2 files changed, 19 insertions, 14 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 bbfa38a0b5..ccc6c54f81 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,41 +7,46 @@ 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[sgw - rebased for 2.6.1]
11Signed-off-by: Saul wold <sgw@linux.intel.com>
10 12
11Index: git/Makefile 13Index: git/Makefile
12=================================================================== 14===================================================================
13--- git.orig/Makefile 15--- git.orig/Makefile
14+++ git/Makefile 16+++ git/Makefile
15@@ -62,19 +62,19 @@ obj-m += lib/ 17@@ -68,19 +68,19 @@ obj-m += lib/
16 endif # CONFIG_TRACEPOINTS 18 endif # CONFIG_TRACEPOINTS
17 19
18 else # KERNELRELEASE 20 else # KERNELRELEASE
19- KERNELDIR ?= /lib/modules/$(shell uname -r)/build 21- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
22- PWD := $(shell pwd)
23- CFLAGS = $(EXTCFLAGS)
24-
20+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build 25+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
21 PWD := $(shell pwd) 26+ PWD := $(shell pwd)
22 CFLAGS = $(EXTCFLAGS) 27+ CFLAGS = $(EXTCFLAGS)
23 28+
24 default: 29 default:
25- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules 30- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
26+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules 31+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
27 32
28 modules_install: 33 modules_install:
29- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install 34- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
30+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install 35+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
31 36
32 clean: 37 clean:
33- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean 38- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
34+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean 39+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
35 40
36 %.i: %.c 41 %.i: %.c
37- $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ 42- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
38+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ 43+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@
39 endif # KERNELRELEASE 44 endif # KERNELRELEASE
40Index: git/probes/Makefile 45Index: git/probes/Makefile
41=================================================================== 46===================================================================
42--- git.orig/probes/Makefile 47--- git.orig/probes/Makefile
43+++ git/probes/Makefile 48+++ git/probes/Makefile
44@@ -231,18 +231,18 @@ endif 49@@ -267,18 +267,18 @@ endif
45 endif 50 endif
46 51
47 else 52 else
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb
index 420b691db1..be09a82f82 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \
8 8
9inherit module 9inherit module
10 10
11SRCREV = "1b2a5429de815c95643df2eadf91253909708728" 11SRCREV = "62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d"
12 12
13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' 13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux'
14 14