From 800a0906c7a322f6c01e054901228fd5a10c36bd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 5 Mar 2015 16:43:39 +0100 Subject: ktap: rename recipes to indicate they are from git * set PV so that it shows git revision and also automatically rebuilds them when SRCREV is changed Signed-off-by: Martin Jansa --- meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb | 22 ---------------------- meta-oe/recipes-kernel/ktap/ktap-module_git.bb | 22 ++++++++++++++++++++++ meta-oe/recipes-kernel/ktap/ktap.inc | 1 + meta-oe/recipes-kernel/ktap/ktap_0.4.bb | 26 -------------------------- meta-oe/recipes-kernel/ktap/ktap_git.bb | 26 ++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 48 deletions(-) delete mode 100644 meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap-module_git.bb delete mode 100644 meta-oe/recipes-kernel/ktap/ktap_0.4.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap_git.bb (limited to 'meta-oe/recipes-kernel') diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb b/meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb deleted file mode 100644 index 62f2a99a25..0000000000 --- a/meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -# Released under the MIT license (see COPYING.MIT for the terms) - -require ktap.inc - -SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux" - -inherit module - -# Available package configs: ffi (only supported on x86_64) -PACKAGECONFIG ?= "" - -# Only build the module -MAKE_TARGETS = "${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} mod" - -# Kernel module packages MUST begin with 'kernel-module-', otherwise -# multilib image generation can fail. -# -# The following line is only necessary if the recipe name does not begin -# with kernel-module-. -# -PKG_${PN} = "kernel-module-${PN}" - diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb new file mode 100644 index 0000000000..62f2a99a25 --- /dev/null +++ b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb @@ -0,0 +1,22 @@ +# Released under the MIT license (see COPYING.MIT for the terms) + +require ktap.inc + +SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux" + +inherit module + +# Available package configs: ffi (only supported on x86_64) +PACKAGECONFIG ?= "" + +# Only build the module +MAKE_TARGETS = "${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} mod" + +# Kernel module packages MUST begin with 'kernel-module-', otherwise +# multilib image generation can fail. +# +# The following line is only necessary if the recipe name does not begin +# with kernel-module-. +# +PKG_${PN} = "kernel-module-${PN}" + diff --git a/meta-oe/recipes-kernel/ktap/ktap.inc b/meta-oe/recipes-kernel/ktap/ktap.inc index 93a4e2ca32..2c94a08d64 100644 --- a/meta-oe/recipes-kernel/ktap/ktap.inc +++ b/meta-oe/recipes-kernel/ktap/ktap.inc @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.ktap.org" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE-GPL;md5=eb723b61539feef013de476e68b5c50a" +PV = "0.4+gitr${SRCPV}" SRCREV = "c8401e07c89cdec9a5f673da4ddb12b7982b522b" SRC_URI = "git://github.com/ktap/ktap.git" diff --git a/meta-oe/recipes-kernel/ktap/ktap_0.4.bb b/meta-oe/recipes-kernel/ktap/ktap_0.4.bb deleted file mode 100644 index cbdabf82d8..0000000000 --- a/meta-oe/recipes-kernel/ktap/ktap_0.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -# Released under the MIT license (see COPYING.MIT for the terms) - -require ktap.inc - -SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux" -DEPENDS = "ktap-module" - -#Available package configs: -# libelf - needed to resolve symbols in DSO and for sdt -# ffi - only supports x86_64 for now!. Needs to be enabled for ktap-module too. -PACKAGECONFIG ?= "libelf" - -PACKAGECONFIG[libelf] = ",,elfutils" - -# Only build the userspace app -EXTRA_OEMAKE = "${@base_contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \ - ${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \ - ktap" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/ktap ${D}${bindir}/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN} = "kernel-module-ktapvm" diff --git a/meta-oe/recipes-kernel/ktap/ktap_git.bb b/meta-oe/recipes-kernel/ktap/ktap_git.bb new file mode 100644 index 0000000000..cbdabf82d8 --- /dev/null +++ b/meta-oe/recipes-kernel/ktap/ktap_git.bb @@ -0,0 +1,26 @@ +# Released under the MIT license (see COPYING.MIT for the terms) + +require ktap.inc + +SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux" +DEPENDS = "ktap-module" + +#Available package configs: +# libelf - needed to resolve symbols in DSO and for sdt +# ffi - only supports x86_64 for now!. Needs to be enabled for ktap-module too. +PACKAGECONFIG ?= "libelf" + +PACKAGECONFIG[libelf] = ",,elfutils" + +# Only build the userspace app +EXTRA_OEMAKE = "${@base_contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \ + ${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \ + ktap" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/ktap ${D}${bindir}/ +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +RDEPENDS_${PN} = "kernel-module-ktapvm" -- cgit v1.2.3-54-g00ecf