mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-15 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

lttng-modules: drop makefile patch

Browse Source 
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>
This commit is contained in:
Nathan Lynch
2015-06-15 13:37:24 -05:00
committed by Richard Purdie
parent f677b5893d
commit 41423d94a7
2 changed files with 2 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
View File

@@ -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 <zumeng.chen@windriver.com>
[sgw - rebased for 2.6.1]
Signed-off-by: Saul wold <sgw@linux.intel.com>
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

6
meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb
View File

@@ -12,13 +12,11 @@ SRCREV = "62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d"
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux'
SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \
file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
"
SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6"
export INSTALL_MOD_DIR="kernel/lttng-modules"
export KERNEL_SRC="${STAGING_KERNEL_DIR}"
EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
S = "${WORKDIR}/git"