[meta-oe][PATCH 1/3] ktap: rename recipes to indicate they are from git

[meta-oe][PATCH 1/3] ktap: rename recipes to indicate they are from git

[Martin Jansa]

* set PV so that it shows git revision and also automatically rebuilds them
  when SRCREV is changed

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-kernel/ktap/{ktap-module_0.4.bb => ktap-module_git.bb} | 0
 meta-oe/recipes-kernel/ktap/ktap.inc                                   | 1 +
 meta-oe/recipes-kernel/ktap/{ktap_0.4.bb => ktap_git.bb}               | 0
 3 files changed, 1 insertion(+)
 rename meta-oe/recipes-kernel/ktap/{ktap-module_0.4.bb => ktap-module_git.bb} (100%)
 rename meta-oe/recipes-kernel/ktap/{ktap_0.4.bb => ktap_git.bb} (100%)

diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb
similarity index 100%
rename from meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb
rename to meta-oe/recipes-kernel/ktap/ktap-module_git.bb
diff --git a/meta-oe/recipes-kernel/ktap/ktap.inc b/meta-oe/recipes-kernel/ktap/ktap.inc
index 93a4e2c..2c94a08 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_git.bb
similarity index 100%
rename from meta-oe/recipes-kernel/ktap/ktap_0.4.bb
rename to meta-oe/recipes-kernel/ktap/ktap_git.bb
-- 
2.3.1

[meta-oe][PATCH 2/3] ktap: change kernel-module-ktapvm RDEPENDS to RRECOMMENDS

[Martin Jansa]

* even if it makes sense in this case, don't give bad example for other people to
  copy & paste to other recipes, kernel modules should be only recommended, so that
  it still works fine if someone includes the module inside kernel image

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-kernel/ktap/ktap_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-kernel/ktap/ktap_git.bb b/meta-oe/recipes-kernel/ktap/ktap_git.bb
index cbdabf8..2053783 100644
--- a/meta-oe/recipes-kernel/ktap/ktap_git.bb
+++ b/meta-oe/recipes-kernel/ktap/ktap_git.bb
@@ -23,4 +23,4 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-RDEPENDS_${PN} = "kernel-module-ktapvm"
+RRECOMMENDS_${PN} = "kernel-module-ktapvm"
-- 
2.3.1

[meta-oe][PATCH 3/3] ktap-module: blacklist because it's not compatible with 3.19 kernel

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-kernel/ktap/ktap-module_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb
index 62f2a99..e3c94e3 100644
--- a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb
+++ b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb
@@ -6,6 +6,9 @@ SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux"
 
 inherit module
 
+# See https://github.com/ktap/ktap/issues/80
+PNBLACKLIST[ktap-module] ?= "Not compatible with 3.19 kernel"
+
 # Available package configs: ffi (only supported on x86_64)
 PACKAGECONFIG ?= ""
 
-- 
2.3.1