From cefb6645d78deed933b2284f3f00baf226199d9b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 12 May 2015 12:02:46 -0700 Subject: lttng-modules: Update to stable version 2.6.1 This fixes a build issue with the 3.19.5 kernel where the regmap prototypes have changed. The patch is rebased do to changes in the new version of the Makefile. [YOCTO #7737] (From OE-Core rev: 787fde133c6b50c5df6ce8f90b2906b7955b41e4) (From OE-Core rev: 2a355d2efb44a70571586bc5f6e500fa5d73db33) Signed-off-by: Saul Wold Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 31 ++++++++++-------- meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb | 37 ---------------------- meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb | 37 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.6.1.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 bbfa38a..ccc6c54 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,41 +7,46 @@ build and install lttng-modules, we do this replacement for it as-is. Signed-off-by: Zumeng Chen +[sgw - rebased for 2.6.1] +Signed-off-by: Saul wold Index: git/Makefile =================================================================== --- git.orig/Makefile +++ git/Makefile -@@ -62,19 +62,19 @@ obj-m += lib/ +@@ -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) - ++ PWD := $(shell pwd) ++ CFLAGS = $(EXTCFLAGS) ++ default: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules +- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules ++ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules modules_install: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) 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: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean +- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean ++ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean %.i: %.c -- $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ +- 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 -@@ -231,18 +231,18 @@ endif +@@ -267,18 +267,18 @@ endif endif else diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb deleted file mode 100644 index 4cf01ca..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb +++ /dev/null @@ -1,37 +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 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ - file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ - file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" - -DEPENDS = "virtual/kernel" -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -inherit module - -SRCREV = "1b2a5429de815c95643df2eadf91253909708728" - -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 \ - " - -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.6.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb new file mode 100644 index 0000000..9c08e9c --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb @@ -0,0 +1,37 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit KERNEL MODULE" +DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" +LICENSE = "LGPLv2.1 & GPLv2 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ + file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ + file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" + +DEPENDS = "virtual/kernel" +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +inherit module + +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 \ + " + +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.1