From ba0640a13c88a8aaf5b383e793d02c1f7f08e80a Mon Sep 17 00:00:00 2001 From: Emilia Ciobanu Date: Mon, 8 Jul 2013 16:37:23 +0300 Subject: lttng-modules: Append _git to recipe name and add GIT revision to PV variable Git packages should have the following format for the PV variable: version_tag+git[r|\-|]?AUTOINC+git_revision (From OE-Core rev: 07ca5da4da59a0069e7b8a18e7589e3674f2616c) Signed-off-by: Emilia Ciobanu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb | 34 ------------------------ meta/recipes-kernel/lttng/lttng-modules_git.bb | 34 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb create mode 100644 meta/recipes-kernel/lttng/lttng-modules_git.bb (limited to 'meta/recipes-kernel/lttng') diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.2.0.bb deleted file mode 100644 index dd35396205..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules_2.2.0.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 = "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)) -} - diff --git a/meta/recipes-kernel/lttng/lttng-modules_git.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb new file mode 100644 index 0000000000..3a92879e3c --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_git.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+git${SRCPV}" + +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