From 787fde133c6b50c5df6ce8f90b2906b7955b41e4 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 12 May 2015 12:02:46 -0700 Subject: 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 Signed-off-by: Ross Burton --- ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 31 +++++++++++++--------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'meta/recipes-kernel/lttng/lttng-modules') 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 +[sgw - rebased for 2.6.1] +Signed-off-by: Saul wold 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 -- cgit 1.2.3-korg