From 7782174da7784da9a7fd3a16773f05f64138e5af Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 16 Mar 2013 11:10:54 +0100
Subject: [PATCH] misc: Fix warnings in OE-core master to be included in the
 future

---
 recipes-isdn/dahdi-tools/dahdi-tools.inc                    | 4 ++--
 recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb      | 4 ++--
 .../tasks/task-core-standalone-osmo-sdk-target.bb           | 6 +++++-
 recipes-osmocom/tasks/task-osmocom.bb                       | 4 ++--
 recipes-telephony/tasks/task-telephony-all.bb               | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/recipes-isdn/dahdi-tools/dahdi-tools.inc b/recipes-isdn/dahdi-tools/dahdi-tools.inc
index 61280ea0ad..06ef35cf23 100644
--- a/recipes-isdn/dahdi-tools/dahdi-tools.inc
+++ b/recipes-isdn/dahdi-tools/dahdi-tools.inc
@@ -1,6 +1,6 @@
 DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers"
 DEPENDS = "dahdi-linux libnewt libpcap"
-RDEPENDS += "perl perl-module-strict perl-module-file-basename perl-module-config \
+RDEPENDS_${PN} += "perl perl-module-strict perl-module-file-basename perl-module-config \
              perl-module-warnings perl-module-getopt perl-module-getopt-std \
              perl-module-file perl-module-file-glob perl-module-xsloader \
              perl-module-dynaloader perl-module-carp perl-module-errno"
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
 SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \
            file://perl_install.patch "
 
-INC_PR="r18"
+INC_PR="r19"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \
 		    file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09"
diff --git a/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb
index b86c8e35e7..da0e1050b2 100644
--- a/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb
+++ b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Osmocom round-robin tcpdump/capture"
 LICENSE = "GPLv3+"
-RDEPENDS = "tcpdump bash"
-PR = "r10"
+RDEPENDS_${PN} = "tcpdump bash"
+PR = "r11"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb
index 21193ad84b..4af2f55851 100644
--- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb
+++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb
@@ -8,7 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r3"
 
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
+
+# TODO: We need to rename this task to packagegroup but for now we
+# will need to skip this test.
+INSANE_SKIP_${PN} += "dev-deps"
 
 require task-sdk-osmo.inc
 
diff --git a/recipes-osmocom/tasks/task-osmocom.bb b/recipes-osmocom/tasks/task-osmocom.bb
index de2efa0948..eb6216d729 100644
--- a/recipes-osmocom/tasks/task-osmocom.bb
+++ b/recipes-osmocom/tasks/task-osmocom.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
-PR = "r1"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r2"
 
 RDEPENDS_task-osmocom = "\
     libosmocore \
diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb
index 7ee97ff1cd..1899a9cbcb 100644
--- a/recipes-telephony/tasks/task-telephony-all.bb
+++ b/recipes-telephony/tasks/task-telephony-all.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Task for the meta-telephony layer. This is to build everything"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-ALLOW_EMPTY = "1"
-PR = "r1"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r2"
 
 DEPENDS = "\
         libosmo-abis \