From a3cf4a5aeee9090c48a6813335301ed01e36a9b5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 2 Jul 2013 11:14:40 -0300 Subject: lttng-modules: Update to 2.2.0 based release (From OE-Core rev: 9436f568c23fa669f6db9c75c6e7d0a9f92f5a3a) Signed-off-by: Otavio Salvador Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 66 +++++++++++++++++----- meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb | 35 ------------ meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb | 34 +++++++++++ 3 files changed, 87 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb (limited to 'meta/recipes-kernel') 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 index aa24171f31..30f825c414 100644 --- 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 @@ -7,35 +7,75 @@ build and install lttng-modules, we do this replacement for it as-is. Signed-off-by: Zumeng Chen ---- - Makefile | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 5ac13d7..25caad5 100644 +index a9d1cb1..c1b65b9 100644 --- a/Makefile +++ b/Makefile -@@ -38,17 +38,16 @@ obj-m += lib/ +@@ -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 --- -1.7.5.4 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb deleted file mode 100644 index 0bbaa817ca..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules_2.1.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SECTION = "devel" -SUMMARY = "Linux Trace Toolkit KERNEL MODULE" -DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ - file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ - file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" - -DEPENDS = "virtual/kernel" - -inherit module - -SRCREV = "b374c356eb4827b68754d68adc0f1c94b5de9faa" -PV = "2.1.1" -PR = "r0" - -SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \ - file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" - -export INSTALL_MOD_DIR="kernel/lttng-modules" -export KERNEL_SRC="${STAGING_KERNEL_DIR}" - - -S = "${WORKDIR}/git" - -do_install_append() { - # Delete empty directories to avoid QA failures if no modules were built - find ${D}/lib -depth -type d -empty -exec rmdir {} \; -} - -python do_package_prepend() { - if not os.path.exists(os.path.join(d.getVar('D', True), 'lib/modules')): - bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN', True)) -} - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb new file mode 100644 index 0000000000..dd35396205 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb @@ -0,0 +1,34 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit KERNEL MODULE" +DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ + file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ + file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" + +DEPENDS = "virtual/kernel" + +inherit module + +SRCREV = "1b26381c19dd2d9fa41f52d8dc13b15b8dd32c7c" +PV = "2.2.0" + +SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \ + file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" + +export INSTALL_MOD_DIR="kernel/lttng-modules" +export KERNEL_SRC="${STAGING_KERNEL_DIR}" + + +S = "${WORKDIR}/git" + +do_install_append() { + # Delete empty directories to avoid QA failures if no modules were built + find ${D}/lib -depth -type d -empty -exec rmdir {} \; +} + +python do_package_prepend() { + if not os.path.exists(os.path.join(d.getVar('D', True), 'lib/modules')): + bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN', True)) +} + -- cgit v1.2.3-54-g00ecf