From a114dca8c1daec76ea61848cb405b4b8b1e48666 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 17 Jul 2015 16:12:40 +0100 Subject: lttng-modules: remove obsolete bbappend oe-core now has lttng-modules 2.6.1 so this bbappend isn't required, and is actively harmful when lttng-modules moves past 2.6.1 as it forces the SRVREV back to 2.6.1. Signed-off-by: Ross Burton Signed-off-by: Darren Hart --- ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 71 ---------------------- 1 file changed, 71 deletions(-) delete mode 100644 common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch (limited to 'common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch') diff --git a/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch deleted file mode 100644 index ccc6c54f..00000000 --- a/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch +++ /dev/null @@ -1,71 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -lttng-modules: replace KERNELDIR with KERNEL_SRC - -Since lttng-modules uses the default way of module.bbclass to -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 -@@ -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) -+ - default: -- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules - - 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: -- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean -+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean - - %.i: %.c -- 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 -@@ -267,18 +267,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 -- cgit v1.2.3-54-g00ecf