diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 81 |
1 files changed, 81 insertions, 0 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 new file mode 100644 index 0000000000..30f825c414 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | lttng-modules: replace KERNELDIR with KERNEL_SRC | ||
4 | |||
5 | Since lttng-modules uses the default way of module.bbclass to | ||
6 | build and install lttng-modules, we do this replacement for | ||
7 | it as-is. | ||
8 | |||
9 | Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> | ||
10 | |||
11 | diff --git a/Makefile b/Makefile | ||
12 | index a9d1cb1..c1b65b9 100644 | ||
13 | --- a/Makefile | ||
14 | +++ b/Makefile | ||
15 | @@ -43,19 +43,19 @@ obj-m += lib/ | ||
16 | endif # CONFIG_TRACEPOINTS | ||
17 | |||
18 | else # KERNELRELEASE | ||
19 | - KERNELDIR ?= /lib/modules/$(shell uname -r)/build | ||
20 | + KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build | ||
21 | PWD := $(shell pwd) | ||
22 | CFLAGS = $(EXTCFLAGS) | ||
23 | |||
24 | default: | ||
25 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules | ||
26 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules | ||
27 | |||
28 | modules_install: | ||
29 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install | ||
30 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install | ||
31 | |||
32 | clean: | ||
33 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) clean | ||
34 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean | ||
35 | |||
36 | %.i: %.c | ||
37 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ | ||
38 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ | ||
39 | endif # KERNELRELEASE | ||
40 | diff --git a/README b/README | ||
41 | index 8c5dd46..6bd3334 100644 | ||
42 | --- a/README | ||
43 | +++ b/README | ||
44 | @@ -27,8 +27,8 @@ access to your full kernel source tree), and use: | ||
45 | If you need to specify the target directory to the kernel you want to build | ||
46 | against, use: | ||
47 | |||
48 | -% KERNELDIR=path_to_kernel_dir make | ||
49 | -# KERNELDIR=path_to_kernel_dir make modules_install | ||
50 | +% KERNEL_SRC=path_to_kernel_dir make | ||
51 | +# KERNEL_SRC=path_to_kernel_dir make modules_install | ||
52 | # depmod -a kernel_version | ||
53 | |||
54 | Use lttng-tools to control the tracer. LTTng tools should automatically load | ||
55 | diff --git a/probes/Makefile b/probes/Makefile | ||
56 | index 225803c..3449866 100644 | ||
57 | --- a/probes/Makefile | ||
58 | +++ b/probes/Makefile | ||
59 | @@ -212,18 +212,18 @@ endif | ||
60 | endif | ||
61 | |||
62 | else | ||
63 | - KERNELDIR ?= /lib/modules/$(shell uname -r)/build | ||
64 | + KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build | ||
65 | PWD := $(shell pwd) | ||
66 | CFLAGS = $(EXTCFLAGS) | ||
67 | |||
68 | default: | ||
69 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules | ||
70 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules | ||
71 | |||
72 | modules_install: | ||
73 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install | ||
74 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install | ||
75 | /sbin/depmod -a | ||
76 | |||
77 | clean: | ||
78 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) clean | ||
79 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean | ||
80 | |||
81 | endif | ||