shr.conf: blacklist atd, because it's replaced by atd-over-fso

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 731f194..79c07af 100644 (file)
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -47,6 +47,7 @@ INHERIT += "angstrom"
 
 ANGSTROM_BLACKLIST_pn-bluez-libs  = "bluez-libs 3.x has been replaced by bluez4"
 ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
 
 CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
 

diff --git a/recipes/ffalarms/atd-over-fso_0.70.bb b/recipes/ffalarms/atd-over-fso_0.70.bb
index 951e10c..b042a03 100644 (file)
--- a/recipes/ffalarms/atd-over-fso_0.70.bb
+++ b/recipes/ffalarms/atd-over-fso_0.70.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Lightweight At Daemon working on top of org.freesmartphone.otimed"
 SECTION = "base"
 LICENSE = "GPLV2"
-RCONFLICTS = "at atd"
-RREPLACES = "at atd"
-RPROVIDES = "atd"
+RCONFLICTS_${PN} = "at atd"
+RREPLACES_${PN} = "at atd"
+RPROVIDES_${PN} = "atd"
 DEPENDS = "dbus-glib pkgconfig"
 RDEPENDS += "dbus dbus-glib frameworkd"