diff options
| author | Zumeng Chen <zumeng.chen@windriver.com> | 2012-01-16 23:46:58 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:26 +0000 |
| commit | 95386cfb96ea315fb1df59ff306110b9b784243f (patch) | |
| tree | 00589a501d533c3e6246a6538f790c5838d1ba0e /meta/recipes-kernel | |
| parent | 6d769b286ec52575cf9674799535fef0cf87c73d (diff) | |
| download | poky-95386cfb96ea315fb1df59ff306110b9b784243f.tar.gz | |
lttng-modules: Update to 2.0
This patch intended to integrate the lttng-modules 2.0 package
containing the kernel tracer modules.
LTTng-modules 2.0 is currently in pre-release (-pre11), so we
have to update it when official released.
lttng-2.0 supports lttng-modules extra builds, which don't need
any patches on Linux kernel vs the previous version of lttng.
As described in README of lttng-modules-2.0, so far, it has been
tested in the latest kernel on x86 32/64-bit, and powerpc 32-bit,
, build tested on ARM. So does yocto kernel, the related tests
on qemux86 and qemuppc has been validated and a build test on
qemuarm passed too with this patcheset.
(From OE-Core rev: b054921f7dd59519a896a4e1a5f40965d4abd87e)
Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb | 27 |
2 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch new file mode 100644 index 0000000000..aa24171f31 --- /dev/null +++ b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 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 | Makefile | 7 +++---- | ||
| 12 | 1 files changed, 3 insertions(+), 4 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/Makefile b/Makefile | ||
| 15 | index 5ac13d7..25caad5 100644 | ||
| 16 | --- a/Makefile | ||
| 17 | +++ b/Makefile | ||
| 18 | @@ -38,17 +38,16 @@ obj-m += lib/ | ||
| 19 | endif | ||
| 20 | |||
| 21 | else | ||
| 22 | - KERNELDIR ?= /lib/modules/$(shell uname -r)/build | ||
| 23 | PWD := $(shell pwd) | ||
| 24 | CFLAGS = $(EXTCFLAGS) | ||
| 25 | |||
| 26 | default: | ||
| 27 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules | ||
| 28 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules | ||
| 29 | |||
| 30 | modules_install: | ||
| 31 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install | ||
| 32 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install | ||
| 33 | |||
| 34 | clean: | ||
| 35 | - $(MAKE) -C $(KERNELDIR) M=$(PWD) clean | ||
| 36 | + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean | ||
| 37 | |||
| 38 | endif | ||
| 39 | -- | ||
| 40 | 1.7.5.4 | ||
| 41 | |||
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb new file mode 100644 index 0000000000..5d34c41a34 --- /dev/null +++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | SECTION = "devel" | ||
| 2 | SUMMARY = "Linux Trace Toolkit KERNEL MODULE" | ||
| 3 | DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" | ||
| 4 | LICENSE = "LGPLv2.1 & GPLv2" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1eb086682a7c65a45acd9bcdf6877b3e \ | ||
| 6 | file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ | ||
| 7 | file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" | ||
| 8 | |||
| 9 | DEPENDS = virtual/kernel | ||
| 10 | |||
| 11 | inherit module | ||
| 12 | |||
| 13 | SRCREV = "4d3e89e379fc66480d729abe8daa5c86eb585400" | ||
| 14 | PV = "2.0.pre11+git${SRCREV}" | ||
| 15 | PR = "r0" | ||
| 16 | |||
| 17 | SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \ | ||
| 18 | file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" | ||
| 19 | |||
| 20 | export INSTALL_MOD_DIR="kernel/lttng-modules" | ||
| 21 | |||
| 22 | S = "${WORKDIR}/git" | ||
| 23 | |||
| 24 | # Due to liburcu not building for MIPS currently this recipe needs to | ||
| 25 | # be limited also. | ||
| 26 | # So here let us first suppport x86/arm/powerpc platforms now. | ||
| 27 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux' | ||
