summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
blob: 30f825c4141acfedc15788f08b5d4d42d154fc9e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
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 <zumeng.chen@windriver.com>

diff --git a/Makefile b/Makefile
index a9d1cb1..c1b65b9 100644
--- a/Makefile
+++ b/Makefile
@@ -43,19 +43,19 @@ obj-m += lib/
 endif # CONFIG_TRACEPOINTS
 
 else # KERNELRELEASE
-	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
 
 clean:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
 
 %.i: %.c
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@
 endif # KERNELRELEASE
diff --git a/README b/README
index 8c5dd46..6bd3334 100644
--- a/README
+++ b/README
@@ -27,8 +27,8 @@ access to your full kernel source tree), and use:
 If you need to specify the target directory to the kernel you want to build
 against, use:
 
-% KERNELDIR=path_to_kernel_dir make
-# KERNELDIR=path_to_kernel_dir make modules_install
+% KERNEL_SRC=path_to_kernel_dir make
+# KERNEL_SRC=path_to_kernel_dir make modules_install
 # depmod -a kernel_version
 
 Use lttng-tools to control the tracer. LTTng tools should automatically load
diff --git a/probes/Makefile b/probes/Makefile
index 225803c..3449866 100644
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -212,18 +212,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