[OE-core] [PATCH 2/3] connman.inc: add networkmanager to RCONFLICTS

Hongxu Jia hongxu.jia at windriver.com
Tue Dec 22 08:43:20 UTC 2015


Since networkmanager add connman to its RCONFLICTS,
The connman should do the same thing.

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
---
 meta/recipes-connectivity/connman/connman.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 76e61b4..a4b814a 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -109,6 +109,8 @@ RDEPENDS_${PN} = "\
 	dbus \
 	"
 
+RCONFLICTS_${PN} = "networkmanager"
+
 PACKAGES_DYNAMIC += "^${PN}-plugin-.*"
 
 def add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, add_insane_skip):
-- 
1.9.1




More information about the Openembedded-core mailing list