From 2d01bd48e689656bbe6189243d077f822092a14a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 14 Nov 2013 15:43:49 -0200 Subject: lttng-modules: Update to 2.3.3 version This updates lttng-modules for 2.3.3 and it also fixes the build with 3.12 Linux kernel. While on that, we also renamed the recipe file to follow the other lttng recipes which use the version number on it. Signed-off-by: Otavio Salvador Signed-off-by: Saul Wold --- meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb | 34 ++++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-modules_git.bb | 34 ------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb delete mode 100644 meta/recipes-kernel/lttng/lttng-modules_git.bb diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb new file mode 100644 index 0000000000..f293376e1e --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.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 = "eef112db0e63feff6cbf0a98cda9af607cefb377" +PV = "2.3.3" + +SRC_URI = "git://git.lttng.org/lttng-modules.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_git.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb deleted file mode 100644 index 789b5ec94f..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules_git.bb +++ /dev/null @@ -1,34 +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 = "78c8710bb8e6b7f6301d95afec0305f40fa063ad" -PV = "2.3.0+git${SRCPV}" - -SRC_URI = "git://git.lttng.org/lttng-modules.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 1.2.3-korg