From c6635693f99c415460e65cce93195364d7a50333 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Wed, 16 May 2012 15:13:20 +0200
Subject: [PATCH] dreambox-compat: move runtime dependency to actual users

---
 meta-opendreambox/recipes-dreambox/dccamd/dccamd_1.0.bb   | 4 ++--
 .../recipes-dreambox/enigma2/enigma2-bin-3.2.inc          | 4 ++--
 .../recipes-dreambox/tasks/task-opendreambox-base.bb      | 3 +--
 meta-opendreambox/recipes-dreambox/tpmd/tpmd_1.0.bb       | 4 ++--
 meta-opendreambox/recipes-dreambox/wdog/wdog_1.0.bb       | 8 +++++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/meta-opendreambox/recipes-dreambox/dccamd/dccamd_1.0.bb b/meta-opendreambox/recipes-dreambox/dccamd/dccamd_1.0.bb
index 1ab308aa..fd94ff13 100644
--- a/meta-opendreambox/recipes-dreambox/dccamd/dccamd_1.0.bb
+++ b/meta-opendreambox/recipes-dreambox/dccamd/dccamd_1.0.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Dreamcrypt/Firecrypt Conditional Access Daemon"
-PR = "r5"
+PR = "r6"
 
 SRC_URI[mips32el.md5sum] = "87e5b67b83d329dc171045b99d44dd67"
 SRC_URI[mips32el.sha256sum] = "7da7d8748c40efb479029e40f49c2cc8c507be1caf5bad7e4e267281e38c48e6"
@@ -13,4 +13,4 @@ do_install() {
         install -m 0755 dccamd ${D}${bindir}
 }
 
-RDEPENDS_${PN} = "wdog"
+RDEPENDS_${PN} = "dreambox-compat wdog"
diff --git a/meta-opendreambox/recipes-dreambox/enigma2/enigma2-bin-3.2.inc b/meta-opendreambox/recipes-dreambox/enigma2/enigma2-bin-3.2.inc
index ae397d23..33d251d3 100644
--- a/meta-opendreambox/recipes-dreambox/enigma2/enigma2-bin-3.2.inc
+++ b/meta-opendreambox/recipes-dreambox/enigma2/enigma2-bin-3.2.inc
@@ -1,8 +1,8 @@
 DEPENDS = "libsigc++-1.2"
-INC_PR = "r9"
+INC_PR = "r10"
 
 # Shlibs can't find them. See dreambox-compat.
-RDEPENDS_${PN} += "giflib jpeg libdvbsi++ libpython2"
+RDEPENDS_${PN} += "dreambox-compat giflib jpeg libdvbsi++ libpython2"
 
 require enigma2-bin-common.inc
 
diff --git a/meta-opendreambox/recipes-dreambox/tasks/task-opendreambox-base.bb b/meta-opendreambox/recipes-dreambox/tasks/task-opendreambox-base.bb
index 574220f1..ab896a57 100644
--- a/meta-opendreambox/recipes-dreambox/tasks/task-opendreambox-base.bb
+++ b/meta-opendreambox/recipes-dreambox/tasks/task-opendreambox-base.bb
@@ -2,7 +2,7 @@ SUMMARY = "OpenDreambox: Base Task for the OpenDreambox Distribution"
 SECTION = "opendreambox/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${OPENDREAMBOX_BASE}/LICENSE;md5=0a5ec7423edaca24547634f416478834"
-PR = "r19"
+PR = "r20"
 
 inherit task
 
@@ -30,7 +30,6 @@ RRECOMMENDS_${PN} = " \
   autofs \
   avahi-daemon \
   dccamd \
-  dreambox-compat \
   dropbear \
   e2fsprogs-e2fsck \
   libpagecache \
diff --git a/meta-opendreambox/recipes-dreambox/tpmd/tpmd_1.0.bb b/meta-opendreambox/recipes-dreambox/tpmd/tpmd_1.0.bb
index 7a68a2d8..fe6a3d1e 100644
--- a/meta-opendreambox/recipes-dreambox/tpmd/tpmd_1.0.bb
+++ b/meta-opendreambox/recipes-dreambox/tpmd/tpmd_1.0.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Dreambox TPM Daemon"
-PR = "r4"
+PR = "r5"
 
 SRC_URI[mips32el.md5sum] = "36218ca3eff5bd0bcb13055026e50d63"
 SRC_URI[mips32el.sha256sum] = "969438a72ca7c473903516e845cefe52313c01b4de5692bf2fa613a7814a1a84"
@@ -13,6 +13,6 @@ do_install() {
         install -m 0755 tpmd ${D}${bindir}
 }
 
-RDEPENDS_${PN} = "wdog"
+RDEPENDS_${PN} = "dreambox-compat wdog"
 
 INITSCRIPT_PARAMS = "start 60 S ."
diff --git a/meta-opendreambox/recipes-dreambox/wdog/wdog_1.0.bb b/meta-opendreambox/recipes-dreambox/wdog/wdog_1.0.bb
index 855eea36..fdc030e8 100644
--- a/meta-opendreambox/recipes-dreambox/wdog/wdog_1.0.bb
+++ b/meta-opendreambox/recipes-dreambox/wdog/wdog_1.0.bb
@@ -1,14 +1,16 @@
 SUMMARY = "Dreambox watchdog to automatically restart binaries"
-PR = "r2"
-
-inherit opendreambox-precompiled-binary
+PR = "r3"
 
 SRC_URI[mips32el.md5sum] = "037fcab221a559ec765ce58943c4e95c"
 SRC_URI[mips32el.sha256sum] = "96f3bcb25599562c57f3e451cfc884e39b924b6998032b0b562c66430d271483"
 SRC_URI[mips32el-nf.md5sum] = "628c9db98032e6bbc942ab5fc94a39db"
 SRC_URI[mips32el-nf.sha256sum] = "83b8b3e61c3695e527f42e446628e4b9a8d23dcfe8a1949bfe07315706fc7078"
 
+inherit opendreambox-precompiled-binary
+
 do_install() {
         install -d ${D}${bindir}
         install -m 0755 wdog ${D}${bindir}
 }
+
+RDEPENDS_${PN} = "dreambox-compat"
-- 
2.20.1