diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-02-04 11:29:38 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-02-05 11:05:51 +0100 |
commit | 451c5cd71087077d2f09a539845caecaf2a2fa38 (patch) | |
tree | 4ac53b18a3490b8fedc46082885831b9f2cb9afa | |
parent | 26f4012c8774d94c2317d916000fbcb1452fd55e (diff) | |
download | ast2050-yocto-openembedded-451c5cd71087077d2f09a539845caecaf2a2fa38.zip ast2050-yocto-openembedded-451c5cd71087077d2f09a539845caecaf2a2fa38.tar.gz |
qconnman: use RCONFLICTS correctly
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-qt/qconnman/qconnman-e_git.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qconnman/qconnman_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb index 2fcd3da..1033bf2 100644 --- a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb +++ b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb @@ -1,6 +1,6 @@ require qconnman.inc -RCONFLICTS = "qconnman" +RCONFLICTS_${PN} = "qconnman" inherit qt4e diff --git a/meta-oe/recipes-qt/qconnman/qconnman_git.bb b/meta-oe/recipes-qt/qconnman/qconnman_git.bb index 9f03b90..d298cb5 100644 --- a/meta-oe/recipes-qt/qconnman/qconnman_git.bb +++ b/meta-oe/recipes-qt/qconnman/qconnman_git.bb @@ -1,6 +1,6 @@ require qconnman.inc -RCONFLICTS = "qconnman-e" +RCONFLICTS_${PN} = "qconnman-e" inherit qt4x11 |