aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorHaris Okanovic <haris.okanovic@ni.com>2015-05-08 14:14:46 -0500
committerArmin Kuster <akuster808@gmail.com>2015-08-03 09:06:59 -0700
commit2ae3be14aed055ddfa2ddbace3771d094f13da4d (patch)
treecd4d356f92b0818eceab40552c9b75a190aee32c /meta-oe/recipes-support
parenteb2c61cac71df10a12985ca5319c63647eec1cce (diff)
downloadmeta-openembedded-2ae3be14aed055ddfa2ddbace3771d094f13da4d.tar.gz
meta-openembedded-2ae3be14aed055ddfa2ddbace3771d094f13da4d.tar.bz2
meta-openembedded-2ae3be14aed055ddfa2ddbace3771d094f13da4d.zip
start-stop-daemon: Fix RCONFLICTS typo
Signed-off-by: Haris Okanovic <haris.okanovic@ni.com> Reviewed-by: Ben Shelton <ben.shelton@ni.com> Acked-by: Brad Mouring <brad.mouring@ni.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
index c8d88b7f4..efdd6b714 100644
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
@@ -4,7 +4,7 @@ LICENSE = "PD"
LIC_FILES_CHKSUM = "file://utils/start-stop-daemon.c;md5=a963623e4588f70122865aaa7a370ce4"
# start-stop-daemon is usually shipped by dpkg
DEPENDS = "ncurses"
-RCONFLICS_${PN} = "dpkg"
+RCONFLICTS_${PN} = "dpkg"
PNBLACKLIST[start-stop-daemon] ?= "BROKEN: fails because of gettext, partial fix is available here http://patchwork.openembedded.org/patch/89867/"