summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/shr.conf1
-rw-r--r--recipes/ffalarms/atd-over-fso_0.70.bb6
2 files changed, 4 insertions, 3 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 731f194823..79c07afbe6 100644
--- 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 951e10c66d..b042a0356a 100644
--- 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"