summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorNathan Lynch <nathan_lynch@mentor.com>2015-06-15 13:37:24 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:46:58 +0100
commit41423d94a7d581e05351e47798dcf4e8d04185c3 (patch)
treea25fe6972bcd7d9a78ed66e84971542fe66a9d49 /meta/recipes-kernel/lttng
parentf677b5893d5c7e41d3c97ee31aa743aefd40d6cf (diff)
downloadpoky-41423d94a7d581e05351e47798dcf4e8d04185c3.tar.gz
lttng-modules: drop makefile patch
The lttng-modules Makefile allows us to specify the kernel we're building against via the KERNELDIR variable on the build command line. Use that and drop the patch (which tends to need updating whenever the upstream Makefile changes). (From OE-Core rev: cc6f6f96b668f7ef3db0f83c7d3585d81c569d31) Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch71
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb6
2 files changed, 2 insertions, 75 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
deleted file mode 100644
index ccc6c54f81..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3lttng-modules: replace KERNELDIR with KERNEL_SRC
4
5Since lttng-modules uses the default way of module.bbclass to
6build and install lttng-modules, we do this replacement for
7it as-is.
8
9Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
10[sgw - rebased for 2.6.1]
11Signed-off-by: Saul wold <sgw@linux.intel.com>
12
13Index: git/Makefile
14===================================================================
15--- git.orig/Makefile
16+++ git/Makefile
17@@ -68,19 +68,19 @@ obj-m += lib/
18 endif # CONFIG_TRACEPOINTS
19
20 else # KERNELRELEASE
21- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
22- PWD := $(shell pwd)
23- CFLAGS = $(EXTCFLAGS)
24-
25+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
26+ PWD := $(shell pwd)
27+ CFLAGS = $(EXTCFLAGS)
28+
29 default:
30- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
31+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
32
33 modules_install:
34- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
35+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
36
37 clean:
38- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
39+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
40
41 %.i: %.c
42- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
43+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@
44 endif # KERNELRELEASE
45Index: git/probes/Makefile
46===================================================================
47--- git.orig/probes/Makefile
48+++ git/probes/Makefile
49@@ -267,18 +267,18 @@ endif
50 endif
51
52 else
53- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
54+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
55 PWD := $(shell pwd)
56 CFLAGS = $(EXTCFLAGS)
57
58 default:
59- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
60+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
61
62 modules_install:
63- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
64+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
65 /sbin/depmod -a
66
67 clean:
68- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
69+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
70
71 endif
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb
index be09a82f82..5bde7ec213 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb
@@ -12,13 +12,11 @@ SRCREV = "62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d"
12 12
13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' 13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux'
14 14
15SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \ 15SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6"
16 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
17 "
18 16
19export INSTALL_MOD_DIR="kernel/lttng-modules" 17export INSTALL_MOD_DIR="kernel/lttng-modules"
20export KERNEL_SRC="${STAGING_KERNEL_DIR}"
21 18
19EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
22 20
23S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
24 22