From 14363c30ce103f3116d687fd279cb671c6337f9a Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 11 Jan 2013 17:28:48 -0600 Subject: recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng recipes-kernel/lttng was removed by a previous patch, which also removed the naming conflict that caused the lttng-2.0 version of lttng to be named recipes-kernel/lttng-2.0. Since the naming conflict has disappeared, we can go back to the simpler naming. (From OE-Core rev: 2027fd1bbfc2c136672d5054ba722e9d9d80451d) Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch (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 new file mode 100644 index 0000000000..aa24171f31 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch @@ -0,0 +1,41 @@ +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 +--- + Makefile | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 5ac13d7..25caad5 100644 +--- a/Makefile ++++ b/Makefile +@@ -38,17 +38,16 @@ obj-m += lib/ + endif + + else +- KERNELDIR ?= /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 + + clean: +- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean ++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean + + endif +-- +1.7.5.4 + -- cgit v1.2.3-54-g00ecf