diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2015-05-12 12:02:46 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 22:21:53 +0100 |
| commit | 787fde133c6b50c5df6ce8f90b2906b7955b41e4 (patch) | |
| tree | 167a3cd9c363e6b56d553bd5c30568a600710de3 /meta/recipes-kernel | |
| parent | d557edc559c8b77083edee2bd4178e24aaf5211c (diff) | |
| download | openembedded-core-contrib-787fde133c6b50c5df6ce8f90b2906b7955b41e4.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]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 31 | ||||
| -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 it as-is. Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> +[sgw - rebased for 2.6.1] +Signed-off-by: Saul wold <sgw@linux.intel.com> Index: git/Makefile =================================================================== --- git.orig/Makefile +++ git/Makefile -@@ -62,19 +62,19 @@ obj-m += lib/ +@@ -68,19 +68,19 @@ obj-m += lib/ endif # CONFIG_TRACEPOINTS else # KERNELRELEASE - KERNELDIR ?= /lib/modules/$(shell uname -r)/build +- PWD := $(shell pwd) +- CFLAGS = $(EXTCFLAGS) +- + KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) - CFLAGS = $(EXTCFLAGS) - ++ PWD := $(shell pwd) ++ CFLAGS = $(EXTCFLAGS) ++ default: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules +- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules ++ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules modules_install: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install +- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install ++ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install clean: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean +- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean ++ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean %.i: %.c -- $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ +- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ ++ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ endif # KERNELRELEASE Index: git/probes/Makefile =================================================================== --- git.orig/probes/Makefile +++ git/probes/Makefile -@@ -231,18 +231,18 @@ endif +@@ -267,18 +267,18 @@ endif endif 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 \ inherit module -SRCREV = "1b2a5429de815c95643df2eadf91253909708728" +SRCREV = "62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' |