From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 28 May 2019 04:01:52 +0000 (+0800)
Subject: connman: add networkmanager as rconflict
X-Git-Tag: uninative-2.6~244
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=240dfe2399ec43c81b3c816c299253ddf6c3a732;p=openembedded-core.git

connman: add networkmanager as rconflict

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/connman/connman_1.37.bb b/meta/recipes-connectivity/connman/connman_1.37.bb
index 12650329c5..00852bf0d6 100644
--- a/meta/recipes-connectivity/connman/connman_1.37.bb
+++ b/meta/recipes-connectivity/connman/connman_1.37.bb
@@ -14,3 +14,4 @@ SRC_URI[md5sum] = "75012084f14fb63a84b116e66c6e94fb"
 SRC_URI[sha256sum] = "6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16"
 
 RRECOMMENDS_${PN} = "connman-conf"
+RCONFLICTS_${PN} = "networkmanager"